fix: make /var/run empty on reboots

For new installs, simply symlink to `/run` (which is `tmpfs`). For old installs, simulate by cleaning up the contents. Fixes #9432 Related to #9365 Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Oct 3, 2024 · b232a75 · b232a75
1 parent 7d02eb6
commit b232a75
Showing 1 changed file with 34 additions and 4 deletions.
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go
@@ -882,20 +882,24 @@ func SetupSharedFilesystems(runtime.Sequence, any) (runtime.TaskExecutionFunc, s
 
 // SetupVarDirectory represents the SetupVarDirectory task.
 func SetupVarDirectory(runtime.Sequence, any) (runtime.TaskExecutionFunc, string) {
-	return func(ctx context.Context, logger *log.Logger, r runtime.Runtime) (err error) {
+	return func(ctx context.Context, logger *log.Logger, r runtime.Runtime) error {
+		if err := setupVarRun(); err != nil {
+			return err
+		}
+
 		for _, p := range []string{"/var/log/audit", "/var/log/containers", "/var/log/pods", "/var/lib/kubelet", "/var/run/lock", constants.SeccompProfilesDirectory} {
-			if err = os.MkdirAll(p, 0o700); err != nil {
+			if err := os.MkdirAll(p, 0o700); err != nil {
 				return err
 			}
 		}
 
 		// Handle Kubernetes directories which need different ownership
 		for _, p := range []string{constants.KubernetesAuditLogDir} {
-			if err = os.MkdirAll(p, 0o700); err != nil {
+			if err := os.MkdirAll(p, 0o700); err != nil {
 				return err
 			}
 
-			if err = os.Chown(p, constants.KubernetesAPIServerRunUser, constants.KubernetesAPIServerRunGroup); err != nil {
+			if err := os.Chown(p, constants.KubernetesAPIServerRunUser, constants.KubernetesAPIServerRunGroup); err != nil {
 				return fmt.Errorf("failed to chown %s: %w", p, err)
 			}
 		}
@@ -904,6 +908,32 @@ func SetupVarDirectory(runtime.Sequence, any) (runtime.TaskExecutionFunc, string
 	}, "setupVarDirectory"
 }
 
+func setupVarRun() error {
+	// handle '/var/run' - if that exists after an upgrade, and is a directory, clean it up
+	// if it doesn't exist, create as a symlink to '/run'
+	runSt, err := os.Lstat("/var/run")
+	if err == nil && runSt.IsDir() {
+		// old Talos versions had '/var/run' as a directory, clean it up on boot
+		entries, err := os.ReadDir("/var/run")
+		if err != nil {
+			return fmt.Errorf("failed to read /var/run: %w", err)
+		}
+
+		for _, e := range entries {
+			if err = os.RemoveAll(filepath.Join("/var/run", e.Name())); err != nil {
+				return fmt.Errorf("failed to remove %s: %w", e.Name(), err)
+			}
+		}
+	} else if err != nil && os.IsNotExist(err) {
+		// '/var/run' doesn't exist, create as a symlink to '/run'
+		if err = os.Symlink("/run", "/var/run"); err != nil {
+			return fmt.Errorf("failed to create /var/run symlink: %w", err)
+		}
+	}
+
+	return nil
+}
+
 // MountUserDisks represents the MountUserDisks task.
 func MountUserDisks(runtime.Sequence, any) (runtime.TaskExecutionFunc, string) {
 	return func(ctx context.Context, logger *log.Logger, r runtime.Runtime) error {