Recovery back to ext2 by default

Signed-off-by: David Cassany <dcassany@suse.com>
rancher · Jan 30, 2024 · e0255d5 · e0255d5
1 parent d6a2136
commit e0255d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -197,9 +197,10 @@ func NewInstallSpec(cfg v1.Config) *v1.InstallSpec {
 	}
 
 	recoverySystem.Source = system
-	recoverySystem.FS = constants.SquashFs
-	recoverySystem.Label = ""
+	recoverySystem.FS = constants.LinuxImgFs
+	recoverySystem.Label = constants.SystemLabel
 	recoverySystem.File = filepath.Join(constants.RecoveryDir, constants.RecoveryImgFile)
+	recoverySystem.MountPoint = constants.WorkingImgDir
 
 	return &v1.InstallSpec{
 		Firmware:       v1.EFI,

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -97,14 +97,12 @@ const (
 	OEMDir             = "/run/elemental/oem"
 	PersistentDir      = "/run/elemental/persistent"
 	PersistentStateDir = "/run/elemental/persistent/.state"
-	ActiveDir          = "/run/elemental/active"
 	TransitionDir      = "/run/elemental/transition"
 	EfiDir             = "/run/elemental/efi"
 	ImgSrcDir          = "/run/elemental/imgsrc"
 	WorkingImgDir      = "/run/elemental/workingtree"
 	OverlayDir         = "/run/elemental/overlay"
 	RunningStateDir    = "/run/initramfs/elemental-state" // TODO: converge this constant with StateDir/RecoveryDir when moving to elemental-rootfs as default rootfs feature.
-	LegacyStateDir     = "/run/initramfs/cos-state"
 
 	// Running mode sentinel files
 	ActiveMode   = "/run/elemental/active_mode"
@@ -183,6 +181,7 @@ const (
 	LegacyImagesPath  = "cOS"
 	LegacyPassivePath = LegacyImagesPath + "/passive.img"
 	LegacyActivePath  = LegacyImagesPath + "/active.img"
+	LegacyStateDir    = "/run/initramfs/cos-state"
 )
 
 // GetDefaultSystemEcludes returns a list of transient paths

diff --git a/pkg/elemental/elemental_test.go b/pkg/elemental/elemental_test.go
@@ -348,7 +348,7 @@ var _ = Describe("Elemental", Label("elemental"), func() {
 				Size:       32,
 				File:       filepath.Join(constants.StateDir, "some.img"),
 				FS:         constants.LinuxImgFs,
-				MountPoint: constants.ActiveDir,
+				MountPoint: constants.TransitionDir,
 				Source:     v1.NewDirSrc(constants.ISOBaseTree),
 			}
 			_ = utils.MkdirAll(fs, constants.ISOBaseTree, constants.DirPerm)

diff --git a/pkg/types/v1/config.go b/pkg/types/v1/config.go
@@ -219,6 +219,8 @@ func (i *InstallSpec) Sanitize() error {
 	// Set default label for non squashfs images
 	if i.RecoverySystem.FS != constants.SquashFs && i.RecoverySystem.Label == "" {
 		i.RecoverySystem.Label = constants.SystemLabel
+	} else if i.RecoverySystem.FS == constants.SquashFs {
+		i.RecoverySystem.Label = ""
 	}
 
 	// Check for extra partitions having set its size to 0