From 3ac2ec08fff1b3df160daf3b56456e579563a5ad Mon Sep 17 00:00:00 2001
From: spl <simon@raspberrypi.org>
Date: Fri, 15 Jul 2016 15:45:38 +0100
Subject: [PATCH] Disable splashscreen (if installed) unless booting to GUI.)

---
 raspi-config | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/raspi-config b/raspi-config
index fd02a7d..3ae981d 100755
--- a/raspi-config
+++ b/raspi-config
@@ -792,6 +792,9 @@ do_boot_behaviour() {
           [ -e /etc/init.d/lightdm ] && update-rc.d lightdm disable 2
           sed /etc/inittab -i -e "s/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/"
         fi
+        if [ -e /etc/init.d/00-splashscreen ]; then
+          update-rc.d 00-splashscreen disable
+        fi
         ;;
       B2*)
         if [ $SYSTEMD -eq 1 ]; then
@@ -801,6 +804,9 @@ do_boot_behaviour() {
           [ -e /etc/init.d/lightdm ] && update-rc.d lightdm disable 2
           sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
         fi
+        if [ -e /etc/init.d/00-splashscreen ]; then
+          update-rc.d 00-splashscreen disable
+        fi
         ;;
       B3*)
         if [ -e /etc/init.d/lightdm ]; then
@@ -812,6 +818,9 @@ do_boot_behaviour() {
           fi
           sed /etc/lightdm/lightdm.conf -i -e "s/^autologin-user=pi/#autologin-user=/"
           disable_raspi_config_at_boot
+          if [ -e /etc/init.d/00-splashscreen ]; then
+            update-rc.d 00-splashscreen enable
+          fi
         else
           whiptail --msgbox "Do sudo apt-get install lightdm to allow configuration of boot to desktop" 20 60 2
           return 1
@@ -828,6 +837,9 @@ do_boot_behaviour() {
             fi
             sed /etc/lightdm/lightdm.conf -i -e "s/^#autologin-user=.*/autologin-user=pi/"
             disable_raspi_config_at_boot
+          if [ -e /etc/init.d/00-splashscreen ]; then
+            update-rc.d 00-splashscreen enable
+          fi
           else
             whiptail --msgbox "The pi user has been removed, can't set up boot to desktop" 20 60 2
           fi
@@ -1107,15 +1119,11 @@ Exec=xcompmgr -a
 EOF
     mv /usr/share/X11/xorg.conf.d/99-fbturbo.conf /usr/share/X11/xorg.conf.d/99-fbturbo.~
     sed $CONFIG -i -e "s/^gpu_mem/#gpu_mem/"
-    mv /etc/ld.so.conf.d/00-vmcs.conf /etc/ld.so.conf.d/z00-vmcs.conf
-    ldconfig
     STATUS=enabled
   elif [ $RET -eq 1 ]; then # disable driver
     sed $CONFIG -i -e "s/^dtoverlay=vc4-kms-v3d/#dtoverlay=vc4-kms-v3d/"
     rm /etc/xdg/autostart/xcompmgr.desktop
     mv /usr/share/X11/xorg.conf.d/99-fbturbo.~ /usr/share/X11/xorg.conf.d/99-fbturbo.conf
-    mv /etc/ld.so.conf.d/z00-vmcs.conf /etc/ld.so.conf.d/00-vmcs.conf
-    ldconfig
     STATUS=disabled
   else
     return $RET