diff --git a/pkg/elemental/elemental.go b/pkg/elemental/elemental.go index 8cf49f1b5db..cef5628fe78 100644 --- a/pkg/elemental/elemental.go +++ b/pkg/elemental/elemental.go @@ -495,7 +495,6 @@ func DeployRecoverySystem(cfg types.Config, img *types.Image) error { kernel, initrd, filepath.Join(transientTree, cnst.GrubCfgPath, cnst.BootargsCfg), - filepath.Join(transientTree, cnst.LegacyGrubCfgPath, cnst.BootargsCfg), } { if exist, _ := utils.Exists(cfg.Fs, file); !exist { cfg.Logger.Debugf("File '%s' not found, skipping", file) diff --git a/pkg/features/embedded/grub-default-bootargs/etc/elemental/bootargs.cfg b/pkg/features/embedded/grub-default-bootargs/etc/elemental/bootargs.cfg index 679f68326e2..b7fe95e2972 100644 --- a/pkg/features/embedded/grub-default-bootargs/etc/elemental/bootargs.cfg +++ b/pkg/features/embedded/grub-default-bootargs/etc/elemental/bootargs.cfg @@ -15,12 +15,12 @@ if [ -n "${img}" ]; then fi if [ "${mode}" == "recovery" ]; then - set kernelcmd="console=tty1 console=ttyS0 root=LABEL=${recovery_label} ${img_arg} elemental.mode=${mode} elemental.oemlabel=${oem_label} security=selinux enforcing=0 rd.neednet=0" + set kernelcmd="console=tty1 console=ttyS0 root=LABEL=${recovery_label} ${img_arg} elemental.mode=${mode} elemental.oemlabel=${oem_label} security=selinux enforcing=0 rd.neednet=1" else if [ "${snapshotter}" == "btrfs" ]; then set snap_arg="elemental.snapshotter=btrfs" fi - set kernelcmd="console=tty1 console=ttyS0 root=LABEL=${state_label} ${img_arg} ${snap_arg} elemental.mode=${mode} elemental.oemlabel=${oem_label} panic=5 security=selinux rd.neednet=0 fsck.mode=force fsck.repair=yes" + set kernelcmd="console=tty1 console=ttyS0 root=LABEL=${state_label} ${img_arg} ${snap_arg} elemental.mode=${mode} elemental.oemlabel=${oem_label} panic=5 security=selinux rd.neednet=1 fsck.mode=force fsck.repair=yes" fi set kernel=/boot/vmlinuz diff --git a/tests/common/common.go b/tests/common/common.go index 6f4649265bb..766bd18be3d 100644 --- a/tests/common/common.go +++ b/tests/common/common.go @@ -20,8 +20,8 @@ import ( "flag" ) -const DefaultUpgradeImage = "ghcr.io/rancher/elemental-toolkit/elemental-green:v2.0.0" -const DefaultToolkitImage = "ghcr.io/rancher/elemental-toolkit/elemental-cli:v2.0.0" +const DefaultUpgradeImage = "ghcr.io/rancher/elemental-toolkit/elemental-green:v2.1.0" +const DefaultToolkitImage = "ghcr.io/rancher/elemental-toolkit/elemental-cli:v2.1.0" var upgradeImage string var toolkitImage string