Add D-Bus installation to restarter logic

Signed-off-by: Kate Goldenring <[email protected]>

Author: kate-goldenring

cmd/node-installer/install.go

@@ -116,14 +116,6 @@ func RunInstall(config Config, rootFs, hostFs afero.Fs, restarter containerd.Res
 		return nil
 	}
 
-	// Ensure D-Bus is installed and running if using systemd
-	if containerd.UsesSystemd() {
-		err = containerd.InstallDbus()
-		if err != nil {
-			return fmt.Errorf("failed to install D-Bus: %w", err)
-		}
-	}
-
 	slog.Info("restarting containerd")
 	err = containerdConfig.RestartRuntime()
 	if err != nil {

internal/containerd/install_dbus.go

@@ -29,7 +29,7 @@ func InstallDbus() error {
 		slog.Info("D-Bus is already installed and running")
 		return nil
 	}
-	slog.Info("Installing D-Bus")
+	slog.Info("installing D-Bus")
 	whichApt := nsenterCmd("which", "apt-get")
 	whichYum := nsenterCmd("which", "yum")
 	whichDnf := nsenterCmd("which", "dnf")
@@ -63,7 +63,7 @@ func InstallDbus() error {
 		return nil
 	}
 
-	slog.Info("Restarting D-Bus")
+	slog.Info("restarting D-Bus")
 	cmd = nsenterCmd("systemctl", "restart", "dbus")
 	if err := cmd.Run(); err != nil {
 		return fmt.Errorf("failed to restart D-Bus: %w", err)

internal/containerd/restart_unix.go

@@ -36,6 +36,15 @@ func NewRestarter() Restarter {
 }
 
 func (c restarter) Restart() error {
+	// To make sure any runtime options are applied, ensure D-Bus is
+	// installed and running if using systemd
+	if UsesSystemd() {
+		err := InstallDbus()
+		if err != nil {
+			return fmt.Errorf("failed to install D-Bus: %w", err)
+		}
+	}
+
 	pid, err := getPid()
 	if err != nil {
 		return err