Skip to content

Commit

Permalink
skupper init fixes for rootful podman (#1469)
Browse files Browse the repository at this point in the history
When a skupper site (podman) is initialized, the Skupper CLI checks
whether user is root before it creates a systemd service as user level only.

Fixes #1465
  • Loading branch information
Karen-Schoener authored May 16, 2024
1 parent 0b23610 commit c04a4b9
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 8 deletions.
3 changes: 3 additions & 0 deletions pkg/config/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ func GetPlatform() types.Platform {
}

func GetDataHome() string {
if os.Getuid() == 0 {
return "/usr/local/bin"
}
dataHome, ok := os.LookupEnv("XDG_DATA_HOME")
if !ok {
homeDir, _ := os.UserHomeDir()
Expand Down
68 changes: 60 additions & 8 deletions pkg/config/systemd.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@ func (s *systemdServiceInfo) Create() error {
}

// Enabling systemd user service
cmd := exec.Command("systemctl", "--user", "enable", serviceName)
cmd := GetCmdEnableSystemdService(serviceName)
err = cmd.Run()
if err != nil {
return fmt.Errorf("Unable to enable user service: %w", err)
}

// Reloading systemd user daemon
cmd = exec.Command("systemctl", "--user", "daemon-reload")
cmd = GetCmdReloadSystemdDaemon()
err = cmd.Run()
if err != nil {
return fmt.Errorf("Unable to user service daemon-reload: %w", err)
}

// Starting systemd user service
cmd = exec.Command("systemctl", "--user", "start", serviceName)
cmd = GetCmdStartSystemdService(serviceName)
err = cmd.Run()
if err != nil {
return fmt.Errorf("Unable to start user service: %w", err)
Expand All @@ -84,6 +84,9 @@ func (s *systemdServiceInfo) Create() error {
}

func (s *systemdServiceInfo) getServiceFile() string {
if os.Getuid() == 0 {
return path.Join("/etc/systemd/system", s.getServiceName())
}
return path.Join(GetConfigHome(), "systemd/user", s.getServiceName())
}

Expand All @@ -98,29 +101,78 @@ func (s *systemdServiceInfo) Remove() error {

// Stopping systemd user service
serviceName := "skupper-" + string(s.Platform) + ".service"
cmd := exec.Command("systemctl", "--user", "stop", serviceName)
cmd := GetCmdStopSystemdService(serviceName)
_ = cmd.Run()

// Disabling systemd user service
cmd = exec.Command("systemctl", "--user", "disable", serviceName)
cmd = GetCmdDisableSystemdService(serviceName)
_ = cmd.Run()

// Removing the .service file
_ = os.Remove(s.getServiceFile())

// Reloading systemd user daemon
cmd = exec.Command("systemctl", "--user", "daemon-reload")
cmd = GetCmdReloadSystemdDaemon()
_ = cmd.Run()

// Resetting failed status
cmd = exec.Command("systemctl", "--user", "reset-failed", serviceName)
cmd = GetCmdResetFailedSystemService(serviceName)
_ = cmd.Run()

return nil
}

func GetCmdEnableSystemdService(serviceName string) *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "enable", serviceName)
}
return exec.Command("systemctl", "--user", "enable", serviceName)
}

func GetCmdDisableSystemdService(serviceName string) *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "disable", serviceName)
}
return exec.Command("systemctl", "--user", "disable", serviceName)
}

func GetCmdReloadSystemdDaemon() *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "daemon-reload")
}
return exec.Command("systemctl", "--user", "daemon-reload")
}

func GetCmdStartSystemdService(serviceName string) *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "start", serviceName)
}
return exec.Command("systemctl", "--user", "start", serviceName)
}

func GetCmdStopSystemdService(serviceName string) *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "stop", serviceName)
}
return exec.Command("systemctl", "--user", "stop", serviceName)
}

func GetCmdResetFailedSystemService(serviceName string) *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", "reset-failed", serviceName)
}
return exec.Command("systemctl", "--user", "reset-failed", serviceName)
}

func GetCmdIsSystemdEnabled() *exec.Cmd {
if os.Getuid() == 0 {
return exec.Command("systemctl", []string{"list-units", "--no-pager"}...)
}
return exec.Command("systemctl", []string{"--user", "list-units", "--no-pager"}...)
}

func IsSystemdUserEnabled() bool {
cmd := exec.Command("systemctl", []string{"--user", "list-units", "--no-pager"}...)
cmd := GetCmdIsSystemdEnabled()
if err := cmd.Run(); err != nil {
return false
}
Expand Down

0 comments on commit c04a4b9

Please sign in to comment.