[lorax/master] aarch64 no longer needs explicit console setting (#1170412)
Brian C. Lane
bcl at redhat.com
Thu Dec 4 17:42:49 UTC 2014
As of fedora kernel commit 831ed82ff581629c aarch64 can sort out what to
use for the console on its own, so drop the console= from the aarch64
grub2-efi.cfg template.
---
share/config_files/aarch64/grub2-efi.cfg | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/share/config_files/aarch64/grub2-efi.cfg b/share/config_files/aarch64/grub2-efi.cfg
index 3cb8465..1cc389d 100644
--- a/share/config_files/aarch64/grub2-efi.cfg
+++ b/share/config_files/aarch64/grub2-efi.cfg
@@ -14,10 +14,6 @@ function load_video {
fi
}
-serial --speed=115200
-terminal_input serial console
-terminal_output serial console
-
load_video
set gfxpayload=keep
insmod gzio
@@ -31,11 +27,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ###
menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
- linux @KERNELPATH@ @ROOT@ ro console=ttyS0,115200n8
+ linux @KERNELPATH@ @ROOT@ ro
initrd @INITRDPATH@
}
menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os {
- linux @KERNELPATH@ @ROOT@ rd.live.check console=ttyS0,115200n8
+ linux @KERNELPATH@ @ROOT@ rd.live.check
initrd @INITRDPATH@
}
submenu 'Troubleshooting -->' {
@@ -44,7 +40,7 @@ submenu 'Troubleshooting -->' {
initrd @INITRDPATH@
}
menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os {
- linux @KERNELPATH@ @ROOT@ rescue console=ttyS0,115200n8
+ linux @KERNELPATH@ @ROOT@ rescue
initrd @INITRDPATH@
}
}
--
1.9.3
More information about the anaconda-patches
mailing list