From e3581aad6a9da6b6c263ae3bebc956de72067f8a Mon Sep 17 00:00:00 2001
From: Simon Long <simon@raspberrypi.org>
Date: Wed, 3 May 2017 11:28:17 +0100
Subject: [PATCH] Update splash screen handling to work with GRUB on x86.

---
 raspi-config | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/raspi-config b/raspi-config
index 4c51fc7..5cf6c57 100755
--- a/raspi-config
+++ b/raspi-config
@@ -1005,15 +1005,28 @@ do_boot_splash() {
     RET=$1
   fi
   if [ $RET -eq 0 ]; then
-    if ! grep -q "splash" $CMDLINE ; then
-	  sed -i $CMDLINE -e "s/$/ quiet splash plymouth.ignore-serial-consoles/"
+	if is_pi ; then
+		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
     STATUS=enabled
   elif [ $RET -eq 1 ]; then
-    if grep -q "splash" $CMDLINE ; then
-	    sed -i $CMDLINE -e "s/ quiet//"
-	    sed -i $CMDLINE -e "s/ splash//"
-	    sed -i $CMDLINE -e "s/ plymouth.ignore-serial-consoles//"
+	if is_pi ; then
+		if grep -q "splash" $CMDLINE ; then
+			sed -i $CMDLINE -e "s/ quiet//"
+			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
     STATUS=disabled
   else