From e3876272ef87212539931bb0e9293078af2656cb Mon Sep 17 00:00:00 2001 From: Itxaka Date: Fri, 11 Oct 2024 10:02:25 +0200 Subject: [PATCH] Drop extra cmdline from cloud configs (#1110) --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../static/kairos-overlay-files/files/system/oem/08_grub.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index 8ad605d75..a7690e428 100644 --- a/packages/static/kairos-overlay-files/collection.yaml +++ b/packages/static/kairos-overlay-files/collection.yaml @@ -1,4 +1,4 @@ packages: - name: "kairos-overlay-files" category: "static" - version: "1.3.1" + version: "1.3.2" diff --git a/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml b/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml index 033dd0c99..623e443ee 100644 --- a/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml +++ b/packages/static/kairos-overlay-files/files/system/oem/08_grub.yaml @@ -67,8 +67,6 @@ stages: source "(${bootfile_loc})${bootfile}" fi EOF - # Overrides the active cmdline by adding "rd.emergency=reboot", "rd.shell=0" and "panic=5" - # so that any failure in booting initramfs or kernel loading results in a reboot. # It loads then the boot assessment environment and overrides default boot target if # a boot failure is detected. # A boot is considered failed when both sentinel are present ( upgrade triggered, tentative ). @@ -83,7 +81,6 @@ stages: group: 0 permsisions: 0600 content: | - set extra_active_cmdline="rd.emergency=reboot rd.shell=0 panic=5 systemd.crash_reboot systemd.crash_shell=0" set boot_assessment="/boot_assessment" search --no-floppy --file --set=boot_assessment_blk "${boot_assessment}" if [ "${boot_assessment_blk}" ]; then