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.
This commit is contained in:
parent
b8c867f84f
commit
c20447db15
11
debian/kali-desktop-base.postinst
vendored
11
debian/kali-desktop-base.postinst
vendored
@ -104,17 +104,6 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov
|
|||||||
|
|
||||||
fi
|
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)
|
desktop_base_version=$(dpkg-query -f'${Version}' -W desktop-base 2>/dev/null || true)
|
||||||
if [ "$1" = "configure" ]; then
|
if [ "$1" = "configure" ]; then
|
||||||
if dpkg --compare-versions "$desktop_base_version" lt-nl 10.0.3+kali3 || \
|
if dpkg --compare-versions "$desktop_base_version" lt-nl 10.0.3+kali3 || \
|
||||||
|
|||||||
5
debian/kali-themes.postinst
vendored
5
debian/kali-themes.postinst
vendored
@ -4,6 +4,7 @@ set -e
|
|||||||
|
|
||||||
FILES_TO_DIVERT="
|
FILES_TO_DIVERT="
|
||||||
/etc/lightdm/lightdm-gtk-greeter.conf
|
/etc/lightdm/lightdm-gtk-greeter.conf
|
||||||
|
/etc/plymouth/plymouthd.conf
|
||||||
/etc/xdg/qterminal.org/qterminal.ini
|
/etc/xdg/qterminal.org/qterminal.ini
|
||||||
/etc/xdg/xfce4/panel/default.xml
|
/etc/xdg/xfce4/panel/default.xml
|
||||||
/etc/xdg/xfce4/terminal/terminalrc
|
/etc/xdg/xfce4/terminal/terminalrc
|
||||||
@ -57,6 +58,10 @@ if [ "$1" = "configure" ]; then
|
|||||||
if which update-grub >/dev/null; then
|
if which update-grub >/dev/null; then
|
||||||
update-grub || true
|
update-grub || true
|
||||||
fi
|
fi
|
||||||
|
# Rebuild the initrd for plymouth
|
||||||
|
if which update-initramfs >/dev/null; then
|
||||||
|
update-initramfs -u
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#DEBHELPER#
|
#DEBHELPER#
|
||||||
|
|||||||
1
debian/kali-themes.postrm
vendored
1
debian/kali-themes.postrm
vendored
@ -4,6 +4,7 @@ set -e
|
|||||||
|
|
||||||
FILES_TO_DIVERT="
|
FILES_TO_DIVERT="
|
||||||
/etc/lightdm/lightdm-gtk-greeter.conf
|
/etc/lightdm/lightdm-gtk-greeter.conf
|
||||||
|
/etc/plymouth/plymouthd.conf
|
||||||
/etc/xdg/qterminal.org/qterminal.ini
|
/etc/xdg/qterminal.org/qterminal.ini
|
||||||
/etc/xdg/xfce4/panel/default.xml
|
/etc/xdg/xfce4/panel/default.xml
|
||||||
/etc/xdg/xfce4/terminal/terminalrc
|
/etc/xdg/xfce4/terminal/terminalrc
|
||||||
|
|||||||
4
debian/kali-themes.preinst
vendored
4
debian/kali-themes.preinst
vendored
@ -4,6 +4,7 @@ set -e
|
|||||||
|
|
||||||
FILES_TO_DIVERT="
|
FILES_TO_DIVERT="
|
||||||
/etc/lightdm/lightdm-gtk-greeter.conf
|
/etc/lightdm/lightdm-gtk-greeter.conf
|
||||||
|
/etc/plymouth/plymouthd.conf
|
||||||
/etc/xdg/qterminal.org/qterminal.ini
|
/etc/xdg/qterminal.org/qterminal.ini
|
||||||
/etc/xdg/xfce4/panel/default.xml
|
/etc/xdg/xfce4/panel/default.xml
|
||||||
/etc/xdg/xfce4/terminal/terminalrc
|
/etc/xdg/xfce4/terminal/terminalrc
|
||||||
@ -50,7 +51,8 @@ case "$1" in
|
|||||||
# Dynamically add new diversions when required on upgrade
|
# Dynamically add new diversions when required on upgrade
|
||||||
# Example to divert /etc/xdg/xfce4/panel/default.xml when you
|
# Example to divert /etc/xdg/xfce4/panel/default.xml when you
|
||||||
# upgrade from a version older than 2019.4.6:
|
# 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
|
esac
|
||||||
|
|
||||||
|
|||||||
2
etc/plymouth/plymouthd.conf
Normal file
2
etc/plymouth/plymouthd.conf
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
[Daemon]
|
||||||
|
Theme=kali
|
||||||
@ -1,4 +1,5 @@
|
|||||||
/etc/lightdm/lightdm-gtk-greeter.conf
|
/etc/lightdm/lightdm-gtk-greeter.conf
|
||||||
|
/etc/plymouth/plymouthd.conf
|
||||||
/etc/xdg/qterminal.org/qterminal.ini
|
/etc/xdg/qterminal.org/qterminal.ini
|
||||||
/etc/xdg/xfce4/panel/default.xml
|
/etc/xdg/xfce4/panel/default.xml
|
||||||
/etc/xdg/xfce4/terminal/terminalrc
|
/etc/xdg/xfce4/terminal/terminalrc
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user