Move systemd checks

Author: Arc676

pkg/mig/reconfigure/reconfigure.go

@@ -307,11 +307,6 @@ func (r *Reconfigure) isConfigAlreadyApplied() bool {
 
 // persistConfigIfNeeded persists the configuration if needed
 func (r *Reconfigure) persistConfigIfNeeded() error {
-	if r.opts.ReadonlyHost {
-		log.Info("Host root FS is mounted read-only, config cannot be persisted")
-		return nil
-	}
-
 	if r.opts.HostRootMount == "" || r.opts.HostMigManagerStateFile == "" {
 		return nil
 	}
@@ -327,6 +322,11 @@ func (r *Reconfigure) persistConfigIfNeeded() error {
 
 // persistConfig persists the configuration to the state file
 func (r *Reconfigure) persistConfig() error {
+	if r.opts.ReadonlyHost {
+		log.Info("Host root FS is mounted read-only, config cannot be persisted")
+		return nil
+	}
+
 	config := fmt.Sprintf(`[Service]
 Environment="MIG_PARTED_SELECTED_CONFIG=%s"
 `, r.opts.SelectedMigConfig)
@@ -338,6 +338,10 @@ Environment="MIG_PARTED_SELECTED_CONFIG=%s"
 		return fmt.Errorf("failed to write config to state file: %w", err)
 	}
 
+	if r.systemdManager == nil {
+		return nil
+	}
+
 	return r.systemdManager.ReloadDaemon()
 }
 
@@ -502,11 +506,6 @@ func (r *Reconfigure) handleCDI() error {
 
 // restartHostGPUClients restarts host GPU clients
 func (r *Reconfigure) restartHostGPUClients() error {
-	if r.systemdManager == nil {
-		log.Info("No systemd manager available, not restarting down GPU clients on the host")
-		return nil
-	}
-
 	log.Info("Restarting all GPU clients previously shutdown on the host by restarting their systemd services")
 
 	NoRestartHostSystemdServicesOnExit = true
@@ -722,6 +721,11 @@ func (r *Reconfigure) createCDISpec() error {
 }
 
 func (r *Reconfigure) hostStartSystemdServices() error {
+	if r.systemdManager == nil {
+		log.Info("No systemd manager available, not starting anything via systemd")
+		return nil
+	}
+
 	services := r.stoppedServices
 	var restartServices []string
 	if len(services) == 0 {