M #-: Correct serial console disabling on Amazon2, Alt and OpenSUSE (#72

)
OpenNebula · Mar 21, 2024 · feadcca · feadcca
1 parent cc3ac08
commit feadcca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/packer/alt/11-update-grub.sh b/packer/alt/11-update-grub.sh
@@ -11,11 +11,11 @@ rm -rf /etc/default/grub.d/
 # Drop unwanted.
 
 gawk -i inplace -f- /etc/sysconfig/grub2 <<'EOF'
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<quiet\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<splash\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<quiet\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<splash\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
 { print }
 EOF
 

diff --git a/packer/amazon/11-update-grub.sh b/packer/amazon/11-update-grub.sh
@@ -13,11 +13,11 @@ rm -rf /etc/default/grub.d/
 # Drop unwanted.
 
 gawk -f- /etc/default/grub >/etc/default/grub.new <<'EOF'
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<quiet\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<splash\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<quiet\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<splash\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
 { print }
 EOF
 mv /etc/default/grub{.new,}

diff --git a/packer/opensuse/11-update-grub.sh b/packer/opensuse/11-update-grub.sh
@@ -11,11 +11,11 @@ rm -rf /etc/default/grub.d/
 # Drop unwanted.
 
 gawk -i inplace -f- /etc/default/grub <<'EOF'
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<quiet\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<splash\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
-/^GRUB_CMDLINE_LINUX=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<quiet\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<splash\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<console=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<earlyprintk=ttyS[^ ]*\>/, "") }
+/^GRUB_CMDLINE_LINUX_DEFAULT=/ { gsub(/\<crashkernel=[^ ]*\>/, "crashkernel=no") }
 { print }
 EOF