Recovery back to ext2 by default

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

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -197,8 +197,8 @@ 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)
 
 	return &v1.InstallSpec{

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