aarch64 no longer needs explicit console setting (#1170412)
As of fedora kernel kernel-3.17.4-302.fc21 aarch64 can sort out what to
use for the console on its own, so drop the console= from the aarch64
grub2-efi.cfg template.
(cherry picked from commit 519771a1df
)
This commit is contained in:
parent
6fb5f8b7a9
commit
89559ad7a2
@ -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@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user