feat: remove unnecessary cleanup

Author: NN708

core/system.go

@@ -278,14 +278,13 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 	partFuture.Partition.Unmount() // just in case
 	partBoot.Unmount()
 
-	err = partFuture.Partition.Mount("/part-future/")
+	futureRoot := "/part-future"
+	err = partFuture.Partition.Mount(futureRoot)
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 2.3, err)
 		return err
 	}
 
-	systemNew := filepath.Join(partFuture.Partition.MountPoint)
-
 	cq.Add(func(args ...interface{}) error {
 		return partFuture.Partition.Unmount()
 	}, nil, 90, &goodies.NoErrorHandler{}, false)
@@ -367,21 +366,12 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 		return err
 	}
 
-	if freeSpace || os.Getenv("ABROOT_FREE_SPACE") != "" {
-		PrintVerboseInfo("ABSystemRunOperation", "Deleting future system to free space, this will render the future root temporarily unavailable")
-		err := ClearDirectory(partFuture.Partition.MountPoint, nil)
-		if err != nil {
-			PrintVerboseErr("ABSystem.RunOperation", 4, err)
-			return err
-		}
-	}
-
-	abrootTrans := filepath.Join(partFuture.Partition.MountPoint, "abroot-trans")
+	abrootTrans := filepath.Join(futureRoot, "abroot-trans")
 	err = OciExportRootFs(
 		"abroot-"+uuid.New().String(),
 		imageRecipe,
 		abrootTrans,
-		systemNew,
+		futureRoot,
 	)
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 4.2, err)
@@ -400,7 +390,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 	}
 
 	// Stage 4.2: Repair root integrity
-	err = RepairRootIntegrity(systemNew)
+	err = RepairRootIntegrity(futureRoot)
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 2.4, err)
 		return err
@@ -422,7 +412,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 		return err
 	}
 
-	err = abimage.WriteTo(systemNew)
+	err = abimage.WriteTo(futureRoot)
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 5.2, err)
 		return err
@@ -440,13 +430,13 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 		settings.Cnf.PartCryptVar = device
 	}
 
-	err = settings.WriteConfigToFile(filepath.Join(systemNew, "/usr/share/abroot/abroot.json"))
+	err = settings.WriteConfigToFile(filepath.Join(futureRoot, "/usr/share/abroot/abroot.json"))
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 5.25, err)
 		return err
 	}
 
-	err = pkgM.WriteSummaryToRoot(systemNew)
+	err = pkgM.WriteSummaryToRoot(futureRoot)
 	if err != nil {
 		PrintVerboseErr("ABSystem.RunOperation", 5.26, err)
 		return err
@@ -477,7 +467,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 	PrintVerboseSimple("[Stage 6] -------- ABSystemRunOperation")
 
 	chroot, err := NewChroot(
-		systemNew,
+		futureRoot,
 		partFuture.Partition.Uuid,
 		partFuture.Partition.Device,
 		true,
@@ -509,7 +499,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 		return err
 	}
 
-	newKernelVer := getKernelVersion(filepath.Join(systemNew, "boot"))
+	newKernelVer := getKernelVersion(filepath.Join(futureRoot, "boot"))
 	if newKernelVer == "" {
 		err := errors.New("could not get kernel version")
 		PrintVerboseErr("ABSystem.RunOperation", 7.26, err)
@@ -527,7 +517,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 			return err
 		}
 
-		initMountpoint = filepath.Join(systemNew, "boot", "init")
+		initMountpoint = filepath.Join(futureRoot, "boot", "init")
 		err = initPartition.Mount(initMountpoint)
 		if err != nil {
 			PrintVerboseErr("ABSystem.RunOperation", 7.4, err)
@@ -550,31 +540,31 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 		}
 
 		err = MoveFile(
-			filepath.Join(systemNew, "boot", "vmlinuz-"+newKernelVer),
+			filepath.Join(futureRoot, "boot", "vmlinuz-"+newKernelVer),
 			filepath.Join(futureInitDir, "vmlinuz-"+newKernelVer),
 		)
 		if err != nil {
 			PrintVerboseErr("ABSystem.RunOperation", 7.5, err)
 			return err
 		}
 		err = MoveFile(
-			filepath.Join(systemNew, "boot", "initrd.img-"+newKernelVer),
+			filepath.Join(futureRoot, "boot", "initrd.img-"+newKernelVer),
 			filepath.Join(futureInitDir, "initrd.img-"+newKernelVer),
 		)
 		if err != nil {
 			PrintVerboseErr("ABSystem.RunOperation", 7.6, err)
 			return err
 		}
 		err = MoveFile(
-			filepath.Join(systemNew, "boot", "config-"+newKernelVer),
+			filepath.Join(futureRoot, "boot", "config-"+newKernelVer),
 			filepath.Join(futureInitDir, "config-"+newKernelVer),
 		)
 		if err != nil {
 			PrintVerboseErr("ABSystem.RunOperation", 7.7, err)
 			return err
 		}
 		err = MoveFile(
-			filepath.Join(systemNew, "boot", "System.map-"+newKernelVer),
+			filepath.Join(futureRoot, "boot", "System.map-"+newKernelVer),
 			filepath.Join(futureInitDir, "System.map-"+newKernelVer),
 		)
 		if err != nil {
@@ -589,7 +579,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 
 	err = generateABGrubConf(
 		newKernelVer,
-		systemNew,
+		futureRoot,
 		rootUuid,
 		partFuture.Label,
 		generatedGrubConfigPath,
@@ -612,7 +602,7 @@ func (s *ABSystem) RunOperation(operation ABSystemOperation, freeSpace bool) err
 	os.MkdirAll(newUpperEtc, 0o755)
 	os.MkdirAll(newWorkEtc, 0o755)
 
-	err = EtcBuilder.ExtBuildCommand(oldEtc, systemNew+"/sysconf", oldUpperEtc, newUpperEtc)
+	err = EtcBuilder.ExtBuildCommand(oldEtc, futureRoot+"/sysconf", oldUpperEtc, newUpperEtc)
 	if err != nil {
 		PrintVerboseErr("AbSystem.RunOperation", 8, err)
 		return err

core/utils.go

@@ -19,8 +19,6 @@ import (
 	"io/fs"
 	"os"
 	"os/exec"
-	"path/filepath"
-	"slices"
 	"syscall"
 )
 
@@ -109,27 +107,6 @@ func MoveFile(source, dest string) error {
 	return nil
 }
 
-// ClearDirectory deletes all contents of a directory without removing the directory itself.
-// Skips files/directories specified in the skip list.
-func ClearDirectory(path string, skipList []string) error {
-	files, err := os.ReadDir(path)
-	if err != nil {
-		return err
-	}
-
-	for _, file := range files {
-		if slices.Contains(skipList, file.Name()) {
-			continue
-		}
-		err = os.RemoveAll(filepath.Join(path, file.Name()))
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
 // isDeviceLUKSEncrypted checks whether a device specified by devicePath is a LUKS-encrypted device
 func isDeviceLUKSEncrypted(devicePath string) (bool, error) {
 	PrintVerboseInfo("isDeviceLUKSEncrypted", "Verifying if", devicePath, "is encrypted")