almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

aarch64 no longer needs explicit console setting (#1170413)

Browse Source 
As of kernel-3.18.0-0.54 aarch64 can sort out what to use for the
console on its own, so drop the console= from the aarch64 grub2-efi.cfg
template.

Resolves: rhbz#1170413

(cherry picked from commit 519771a1df)
This commit is contained in:
Brian C. Lane 2014-12-04 09:38:54 -08:00
parent 16b052e99b
commit e1655d7c3a
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/config_files/aarch64/grub2-efi.cfg
View File

@ -14,10 +14,6 @@ function load_video {
fi fi
} }
serial --speed=115200
terminal_input serial console
terminal_output serial console
load_video load_video
set gfxpayload=keep set gfxpayload=keep
insmod gzio insmod gzio
@ -31,11 +27,11 @@ search --no-floppy --set=root -l '@ISOLABEL@'
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry 'Install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { 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@ initrd @INITRDPATH@
} }
menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class red --class gnu-linux --class gnu --class os { 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@ initrd @INITRDPATH@
} }
submenu 'Troubleshooting -->' { submenu 'Troubleshooting -->' {
@ -44,7 +40,7 @@ submenu 'Troubleshooting -->' {
initrd @INITRDPATH@ initrd @INITRDPATH@
} }
menuentry 'Rescue a @PRODUCT@ system' --class red --class gnu-linux --class gnu --class os { 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@ initrd @INITRDPATH@
} }
} }