QubesOS/qubes-linux-kernel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure the rebuild of grub.cfg with plymouth.ignore-serial-consoles

Browse Source 
(cherry picked from commit a44160b1bb)
This commit is contained in:
Frédéric Pierret (fepitre) 2019-03-15 11:09:20 +01:00 committed by Marek Marczykowski-Górecki
parent cb452983b5
commit 4111545966
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel.spec.in
View File

@ -426,8 +426,6 @@ done
/sbin/depmod -a %{kernelrelease} /sbin/depmod -a %{kernelrelease}
%posttrans %posttrans
/bin/kernel-install add %{kernelrelease} /boot/vmlinuz-%{kernelrelease} || exit $?
# with kernel-4.14+ plymouth detects hvc0 serial console and forces text boot # with kernel-4.14+ plymouth detects hvc0 serial console and forces text boot
# we simply make plymouth ignore it to recover the splash screen # we simply make plymouth ignore it to recover the splash screen
if [ -f /etc/default/grub ]; then if [ -f /etc/default/grub ]; then
@ -436,6 +434,8 @@ if [ -f /etc/default/grub ]; then
fi fi
fi fi
/bin/kernel-install add %{kernelrelease} /boot/vmlinuz-%{kernelrelease} || exit $?
# grubby (used by new-kernel-pkg) do not understand xen entries in grub2 config # grubby (used by new-kernel-pkg) do not understand xen entries in grub2 config
if [ -x /sbin/new-kernel-pkg -a -e /boot/grub2/grub.cfg ]; then if [ -x /sbin/new-kernel-pkg -a -e /boot/grub2/grub.cfg ]; then
grub2-mkconfig > /boot/grub2/grub.cfg grub2-mkconfig > /boot/grub2/grub.cfg