From c20447db1567a64cf65bef839f4e0bb47308e7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <raphael@offensive-security.com>
Date: Thu, 7 Nov 2019 14:24:45 +0100
Subject: [PATCH] Move plymouth theme setting to kali-themes

We divert plymouth's configuration file to install our version
configuring the kali theme. Stop using the plymouth-set-default-theme
in kali-desktop-base.
---
 debian/kali-desktop-base.postinst | 11 -----------
 debian/kali-themes.postinst       |  5 +++++
 debian/kali-themes.postrm         |  1 +
 debian/kali-themes.preinst        |  4 +++-
 etc/plymouth/plymouthd.conf       |  2 ++
 files-to-divert                   |  1 +
 6 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 etc/plymouth/plymouthd.conf

diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst
index 2bc981b8..be07e50f 100644
--- a/debian/kali-desktop-base.postinst
+++ b/debian/kali-desktop-base.postinst
@@ -104,17 +104,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov
 
 fi
 
-# Set Kali as default plymouth theme (on initial install and upgrade from
-# old version)
-if [ "${1}" = "configure" ] && dpkg --compare-versions "$2" lt "2019.4.0"; then
-    if which plymouth-set-default-theme > /dev/null; then
-        plymouth-set-default-theme kali
-	if which update-initramfs > /dev/null; then
-	    update-initramfs -u
-        fi
-    fi
-fi
-
 desktop_base_version=$(dpkg-query -f'${Version}' -W desktop-base 2>/dev/null || true)
 if [ "$1" = "configure" ]; then
     if dpkg --compare-versions "$desktop_base_version" lt-nl 10.0.3+kali3 || \
diff --git a/debian/kali-themes.postinst b/debian/kali-themes.postinst
index d02ab8cc..585b7929 100644
--- a/debian/kali-themes.postinst
+++ b/debian/kali-themes.postinst
@@ -4,6 +4,7 @@ set -e
 
 FILES_TO_DIVERT="
 /etc/lightdm/lightdm-gtk-greeter.conf
+/etc/plymouth/plymouthd.conf
 /etc/xdg/qterminal.org/qterminal.ini
 /etc/xdg/xfce4/panel/default.xml
 /etc/xdg/xfce4/terminal/terminalrc
@@ -57,6 +58,10 @@ if [ "$1" = "configure" ]; then
     if which update-grub >/dev/null; then
 	update-grub || true
     fi
+    # Rebuild the initrd for plymouth
+    if which update-initramfs >/dev/null; then
+	update-initramfs -u
+    fi
 fi
 
 #DEBHELPER#
diff --git a/debian/kali-themes.postrm b/debian/kali-themes.postrm
index 18ffbee3..3c3acecd 100644
--- a/debian/kali-themes.postrm
+++ b/debian/kali-themes.postrm
@@ -4,6 +4,7 @@ set -e
 
 FILES_TO_DIVERT="
 /etc/lightdm/lightdm-gtk-greeter.conf
+/etc/plymouth/plymouthd.conf
 /etc/xdg/qterminal.org/qterminal.ini
 /etc/xdg/xfce4/panel/default.xml
 /etc/xdg/xfce4/terminal/terminalrc
diff --git a/debian/kali-themes.preinst b/debian/kali-themes.preinst
index 5f12b346..7cebc0fa 100644
--- a/debian/kali-themes.preinst
+++ b/debian/kali-themes.preinst
@@ -4,6 +4,7 @@ set -e
 
 FILES_TO_DIVERT="
 /etc/lightdm/lightdm-gtk-greeter.conf
+/etc/plymouth/plymouthd.conf
 /etc/xdg/qterminal.org/qterminal.ini
 /etc/xdg/xfce4/panel/default.xml
 /etc/xdg/xfce4/terminal/terminalrc
@@ -50,7 +51,8 @@ case "$1" in
 	# Dynamically add new diversions when required on upgrade
 	# Example to divert /etc/xdg/xfce4/panel/default.xml when you
 	# upgrade from a version older than 2019.4.6:
-	# setup_diversion_on_upgrade $2 2019.4.6 /etc/xdg/xfce4/panel/default.xml
+	# setup_diversion_on_upgrade "$2" 2019.4.6 /etc/xdg/xfce4/panel/default.xml
+	setup_diversion_on_upgrade "$2" 2019.4.9 /etc/plymouth/plymouthd.conf
     ;;
 esac
 
diff --git a/etc/plymouth/plymouthd.conf b/etc/plymouth/plymouthd.conf
new file mode 100644
index 00000000..f9268df5
--- /dev/null
+++ b/etc/plymouth/plymouthd.conf
@@ -0,0 +1,2 @@
+[Daemon]
+Theme=kali
diff --git a/files-to-divert b/files-to-divert
index ed54cc09..cd764fde 100644
--- a/files-to-divert
+++ b/files-to-divert
@@ -1,4 +1,5 @@
 /etc/lightdm/lightdm-gtk-greeter.conf
+/etc/plymouth/plymouthd.conf
 /etc/xdg/qterminal.org/qterminal.ini
 /etc/xdg/xfce4/panel/default.xml
 /etc/xdg/xfce4/terminal/terminalrc