Update splash screen handling to work with GRUB on x86.

This commit is contained in:
Simon Long 2017-05-03 11:28:17 +01:00
parent ca891b6c92
commit e3581aad6a

View File

@ -1005,15 +1005,28 @@ do_boot_splash() {
RET=$1 RET=$1
fi fi
if [ $RET -eq 0 ]; then if [ $RET -eq 0 ]; then
if ! grep -q "splash" $CMDLINE ; then if is_pi ; then
sed -i $CMDLINE -e "s/$/ quiet splash plymouth.ignore-serial-consoles/" if ! grep -q "splash" $CMDLINE ; then
sed -i $CMDLINE -e "s/$/ quiet splash plymouth.ignore-serial-consoles/"
fi
else
sed -i /etc/default/grub -e "s/GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 quiet splash plymouth.ignore-serial-consoles\"/"
update-grub
fi fi
STATUS=enabled STATUS=enabled
elif [ $RET -eq 1 ]; then elif [ $RET -eq 1 ]; then
if grep -q "splash" $CMDLINE ; then if is_pi ; then
sed -i $CMDLINE -e "s/ quiet//" if grep -q "splash" $CMDLINE ; then
sed -i $CMDLINE -e "s/ splash//" sed -i $CMDLINE -e "s/ quiet//"
sed -i $CMDLINE -e "s/ plymouth.ignore-serial-consoles//" sed -i $CMDLINE -e "s/ splash//"
sed -i $CMDLINE -e "s/ plymouth.ignore-serial-consoles//"
fi
else
sed -i /etc/default/grub -e "s/GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\) quiet\(.*\)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 \2\"/"
sed -i /etc/default/grub -e "s/GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\) splash\(.*\)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 \2\"/"
sed -i /etc/default/grub -e "s/GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\) plymouth.ignore-serial-consoles\(.*\)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 \2\"/"
sed -i /etc/default/grub -e "s/GRUB_CMDLINE_LINUX_DEFAULT=\" *\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\"/"
update-grub
fi fi
STATUS=disabled STATUS=disabled
else else