curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-7824: Fix usage of systemctl status to detect which services are installed 

## Summary
To determine which services were installed, cloudflared, was using the command
`systemctl status` this command gives an error if the service is installed
but isn't running, which makes the `uninstall services` command report wrongly
the services not installed. Therefore, this commit adapts it to use the
`systemctl list-units` command combined with a grep to find which services are
installed and need to be removed.
This commit is contained in:
João "Pisco" Fernandes 2023-09-22 15:16:41 +01:00
parent f1d6f0c0be
commit 541c63d737
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cloudflared/linux_service.go
View File

@ -369,7 +369,7 @@ func uninstallSystemd(log *zerolog.Logger) error {
// Get only the installed services // Get only the installed services
installedServices := make(map[string]ServiceTemplate) installedServices := make(map[string]ServiceTemplate)
for serviceName, serviceTemplate := range systemdAllTemplates { for serviceName, serviceTemplate := range systemdAllTemplates {
if err := runCommand("systemctl", "status", serviceName); err == nil { if err := runCommand("systemctl", "list-units", "--all", "|", "grep", serviceName); err == nil {
installedServices[serviceName] = serviceTemplate installedServices[serviceName] = serviceTemplate
} else { } else {
log.Info().Msgf("Service '%s' not installed, skipping its uninstall", serviceName) log.Info().Msgf("Service '%s' not installed, skipping its uninstall", serviceName)