UPD release to v0.9.3 and port stable patches and files

.SRCINFO

@@ -1,8 +1,8 @@
-# Generated by makepkg 4.2.1
+# Generated by mksrcinfo v8
-# Wed Mar 18 01:51:07 UTC 2015
+# Sat Oct 14 13:32:12 UTC 2017
 pkgbase = plymouth-git
-	pkgdesc = A graphical boot splash screen with kernel mode-setting support (development version)
+	pkgdesc = A graphical boot splash screen with kernel mode-setting support (Development version)
-	pkgver = 0.9.2.r0.g2c437c3
+	pkgver = 0.9.3.r3.gf942597
 	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = i686
@@ -16,6 +16,8 @@ pkgbase = plymouth-git
 	optdepends = ttf-dejavu
 	provides = plymouth
 	conflicts = plymouth
+	conflicts = plymouth-legacy
+	conflicts = plymouth-nosystemd
 	options = !libtool
 	options = !emptydirs
 	backup = etc/plymouth/plymouthd.conf
@@ -24,29 +26,37 @@ pkgbase = plymouth-git
 	source = plymouth.encrypt_hook
 	source = plymouth.encrypt_install
 	source = gdm-plymouth.service
-	source = kdm-plymouth.service
 	source = lxdm-plymouth.service
 	source = lightdm-plymouth.service
 	source = slim-plymouth.service
+	source = sddm-plymouth.service
+	source = plymouth-deactivate.service
+	source = plymouth-start.service
+	source = plymouth-start.path
 	source = plymouth.initcpio_hook
 	source = plymouth.initcpio_install
 	source = sd-plymouth.initcpio_install
 	source = plymouth-quit.service.in.patch
+	source = plymouth-set-default-theme.in.patch
 	source = plymouth-update-initrd.patch
-	sha256sums = SKIP
+	md5sums = SKIP
-	sha256sums = 9bac679d2494d9b60b288be87021f1d7b85a9503ebbdce93d6e37c0fc07568ae
+	md5sums = 65fa2763d5c9bb9f80973ea5e6e3db3e
-	sha256sums = cbfb5bcb6897703e088eefdee9d578f75d987116becafecbb2018b283ba3865e
+	md5sums = d67132b297ccfb1a877a2efd78076963
-	sha256sums = 544399d4f3454644f24ad11e504eaa7d622c73942728f52fb55bea054c756fa1
+	md5sums = 65eb269910f1b81e3f0970af456394ca
-	sha256sums = 53818ac8299edbb104e2fa09d376079c10a287da9f8a9b26bfb5fc8789b6bc3c
+	md5sums = ae6e97bb1104bb12cbca6738e3fb872d
-	sha256sums = f9528f0df99f0182c062cd505a49a1e475128e78a7fe535db2a64ee5103abfc8
+	md5sums = 1430ae2ec501d600f8f6771454dc9bbe
-	sha256sums = 6ffe016e8b03354b0a02e2e5d550a0f5f278fceccecfd8747619bdcf6ba9f800
+	md5sums = 870ea3e63c6989e2badf79d1fbafa914
-	sha256sums = 86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71
+	md5sums = a3cfc30df846b2d7057a29e7fbe8733a
-	sha256sums = 0cacaa68e164893ca97d06c7f06d56738a0902991585e456ce687bc2bc1705a0
+	md5sums = f803c315739f46128b99232d64c268ca
-	sha256sums = d349b30832ff84ea7e4b86265efd5d08f8ff00e9153f05f41c8e8b49addf321c
+	md5sums = 006847d16b852c7a50ee2f241fd9647e
-	sha256sums = b0467b7c490539470f726358e5d0c72951efd58d268a2d16411dafacba68041a
+	md5sums = 606cd558141551a1ce0d80150a045d83
-	sha256sums = f434dd9cc96c3cec470aedb7734663cd3e04ffa34eff2bea92708f966132a2da
+	md5sums = 672ad913e2383483bcb4599a0a6bee48
-	sha256sums = fc900a0c330b9bcbf84afaa6575d9df392c4e8c2ea699b72dc9a137f4972de49
+	md5sums = 32f04fdbd1eb94ade30d1e63fdcdd9b5
-	sha256sums = bb597e2ced7c3beca8c9e9f212bc001750746d9b41e00071697a0352ec2a2e27
+	md5sums = c17e915b19a469198a37dd7376a846c7
+	md5sums = af3c3eadc80e240416d11b2d5983dfb5
+	md5sums = 69f16be8d44b25c199eb53c436884b07
+	md5sums = bcd03754af1833376d5e8c5722586a89
+	md5sums = 98c20619291ee7c5a1c5f24b50e92db8
 
 pkgname = plymouth-git
 

PKGBUILD

@@ -1,71 +1,78 @@
-# Maintainer: Patrick Burroughs (Celti) <celti@celti.name>
+# Maintainer: Sebastian Lau <lauseb644 _at_ gmail .dot. com>
-# Contributors: Abbradar, Zephyr, Christian Autermann, Biginoz, Martin Lee, Ricardo Funke,
+# Contributors: Patrick Burroughs (Celti), Abbradar, Zephyr, Christian Autermann, Biginoz, Martin Lee, Ricardo Funke,
 #               PirateJonno, lh, Cilyan Olowen, Shaffer, Brcha, Lyle Putnam, Det, Boohbah,
 #               Lara Maia, Padfoot, Jorge Barroso, carstene1ns
 
 pkgname=plymouth-git
-pkgver=0.9.2.r71.g6fd5c6b
+pkgver=0.9.3.r3.gf942597
 pkgrel=1
-pkgdesc="A graphical boot splash screen with kernel mode-setting support (development version)"
+pkgdesc="A graphical boot splash screen with kernel mode-setting support (Development version)"
 url="http://www.freedesktop.org/wiki/Software/Plymouth/"
-
 arch=('i686' 'x86_64')
 license=('GPL')
 
 depends=('libdrm' 'pango' 'systemd')
 makedepends=('git' 'docbook-xsl')
 optdepends=('ttf-dejavu')
+provides=('plymouth')
+conflicts=('plymouth' 'plymouth-legacy' 'plymouth-nosystemd')
+backup=('etc/plymouth/plymouthd.conf')
 
 options=('!libtool' '!emptydirs')
 
-provides=('plymouth')
+source=("git+http://anongit.freedesktop.org/git/plymouth"
-conflicts=('plymouth')
-backup=('etc/plymouth/plymouthd.conf')
-
-source=('git+http://anongit.freedesktop.org/git/plymouth'
         'arch-logo.png'
-        'plymouth.encrypt_hook'
+	'plymouth.encrypt_hook'
-        'plymouth.encrypt_install'
+	'plymouth.encrypt_install'
-        'gdm-plymouth.service'
+	'gdm-plymouth.service'
-        'kdm-plymouth.service'
+	'lxdm-plymouth.service'
-        'lxdm-plymouth.service'
+	'lightdm-plymouth.service'
-        'lightdm-plymouth.service'
+	'slim-plymouth.service'
-        'slim-plymouth.service'
+	'sddm-plymouth.service'
-        'plymouth.initcpio_hook'
+	'plymouth-deactivate.service'
-        'plymouth.initcpio_install'
+	'plymouth-start.service'
-        'sd-plymouth.initcpio_install'
+	'plymouth-start.path'
-        'plymouth-quit.service.in.patch'
+	'plymouth.initcpio_hook'
-        'plymouth-update-initrd.patch')
+	'plymouth.initcpio_install'
+	'sd-plymouth.initcpio_install'
+	'plymouth-quit.service.in.patch'
+	'plymouth-set-default-theme.in.patch'
+	'plymouth-update-initrd.patch')
 
-sha256sums=('SKIP'
+md5sums=('SKIP'
-            '9bac679d2494d9b60b288be87021f1d7b85a9503ebbdce93d6e37c0fc07568ae'
+         '65fa2763d5c9bb9f80973ea5e6e3db3e'
-            'cbfb5bcb6897703e088eefdee9d578f75d987116becafecbb2018b283ba3865e'
+         'd67132b297ccfb1a877a2efd78076963'
-            '544399d4f3454644f24ad11e504eaa7d622c73942728f52fb55bea054c756fa1'
+         '65eb269910f1b81e3f0970af456394ca'
-            '53818ac8299edbb104e2fa09d376079c10a287da9f8a9b26bfb5fc8789b6bc3c'
+         'ae6e97bb1104bb12cbca6738e3fb872d'
-            'f9528f0df99f0182c062cd505a49a1e475128e78a7fe535db2a64ee5103abfc8'
+         '1430ae2ec501d600f8f6771454dc9bbe'
-            '6ffe016e8b03354b0a02e2e5d550a0f5f278fceccecfd8747619bdcf6ba9f800'
+         '870ea3e63c6989e2badf79d1fbafa914'
-            '86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71'
+         'a3cfc30df846b2d7057a29e7fbe8733a'
-            '0cacaa68e164893ca97d06c7f06d56738a0902991585e456ce687bc2bc1705a0'
+         'f803c315739f46128b99232d64c268ca'
-            'd349b30832ff84ea7e4b86265efd5d08f8ff00e9153f05f41c8e8b49addf321c'
+         '006847d16b852c7a50ee2f241fd9647e'
-            'b0467b7c490539470f726358e5d0c72951efd58d268a2d16411dafacba68041a'
+         '606cd558141551a1ce0d80150a045d83'
-            'f434dd9cc96c3cec470aedb7734663cd3e04ffa34eff2bea92708f966132a2da'
+         '672ad913e2383483bcb4599a0a6bee48'
-            'fc900a0c330b9bcbf84afaa6575d9df392c4e8c2ea699b72dc9a137f4972de49'
+         '32f04fdbd1eb94ade30d1e63fdcdd9b5'
-            'bb597e2ced7c3beca8c9e9f212bc001750746d9b41e00071697a0352ec2a2e27')
+         'c17e915b19a469198a37dd7376a846c7'
+         'af3c3eadc80e240416d11b2d5983dfb5'
+         '69f16be8d44b25c199eb53c436884b07'
+         'bcd03754af1833376d5e8c5722586a89'
+         '98c20619291ee7c5a1c5f24b50e92db8')
 
 pkgver() {
   cd plymouth
   git describe --long | sed 's/-/.r/;s/-/./'
 }
 
+
 prepare() {
 	cd plymouth
-
+	patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch
-	patch -p1 -i "$srcdir"/plymouth-update-initrd.patch
+	patch -p1 -i $srcdir/plymouth-update-initrd.patch
-	patch -p1 -i "$srcdir"/plymouth-quit.service.in.patch
+	patch -p1 -i $srcdir/plymouth-quit.service.in.patch
 }
 
 build() {
-	cd ${pkgname%-*}
+	cd plymouth
 
 	LDFLAGS="$LDFLAGS -ludev" ./autogen.sh \
 		--prefix=/usr \
@@ -92,22 +99,24 @@ build() {
 }
 
 package() {
-	cd plymouth
+  cd plymouth
 
-	make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-	install -Dm644 "$srcdir"/arch-logo.png "$pkgdir"/usr/share/plymouth/arch-logo.png
+  install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png"
 
-	install -Dm644 "$srcdir"/plymouth.encrypt_hook "$pkgdir"/usr/lib/initcpio/hooks/plymouth-encrypt
+  install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
-	install -Dm644 "$srcdir"/plymouth.initcpio_hook "$pkgdir"/usr/lib/initcpio/hooks/plymouth
+  install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
-	install -Dm644 "$srcdir"/plymouth.encrypt_install "$pkgdir"/usr/lib/initcpio/install/plymouth-encrypt
+  install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth"
-	install -Dm644 "$srcdir"/plymouth.initcpio_install "$pkgdir"/usr/lib/initcpio/install/plymouth
+  install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
-	install -Dm644 "$srcdir"/sd-plymouth.initcpio_install "$pkgdir"/usr/lib/initcpio/install/sd-plymouth
+  install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth"
 
-	install -dm755 "$pkgdir"/usr/lib/systemd/system
+  for i in {gdm,sddm,lxdm,slim,lightdm}-plymouth.service; do
-	install -m644 "$srcdir"/{gdm,kdm,lxdm,slim,lightdm}-plymouth.service "$pkgdir"/usr/lib/systemd/system
+    install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
+  done
 
-	ln -s '../systemd-ask-password-plymouth.path' "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-ask-password-plymouth.path
+  install -Dm644 "$srcdir/plymouth-deactivate.service" 	"$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
-
+  install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service"
-	install -Dm644 "$pkgdir"/usr/share/plymouth/plymouthd.defaults "$pkgdir"/etc/plymouth/plymouthd.conf
+  install -Dm644 "$srcdir/plymouth-start.path" 	"$pkgdir/usr/lib/systemd/system/plymouth-start.path"
+  install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
 }

gdm-plymouth.service

@@ -1,7 +1,8 @@
 [Unit]
 Description=GNOME Display Manager
 Conflicts=getty@tty1.service plymouth-quit.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+Wants=plymouth-deactivate.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
 
 [Service]
 ExecStart=/usr/bin/gdm
@@ -12,4 +13,4 @@ StandardOutput=syslog
 StandardError=inherit
 
 [Install]
-Alias=display-manager.service
+Alias=display-manager.service

lxdm-plymouth.service

@@ -1,7 +1,8 @@
 [Unit]
 Description=LXDE Display Manager
 Conflicts=getty@tty1.service plymouth-quit.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+Wants=plymouth-deactivate.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
 
 [Service]
 ExecStart=/usr/sbin/lxdm

plymouth-deactivate.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=Deactivate Plymouth Boot Screen
+After=rc-local.service plymouth-start.service systemd-user-sessions.service
+Before=getty@tty1.service
+
+[Service]
+ExecStart=/usr/bin/plymouth deactivate
+Type=oneshot
+TimeoutSec=20

plymouth-quit.service.in.patch

@@ -1,6 +1,6 @@
 diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/systemd-units/plymouth-quit.service.in
---- plymouth.src/systemd-units/plymouth-quit.service.in	2014-02-20 19:38:13.329427597 +1100
+--- plymouth.src/systemd-units/plymouth-quit.service.in        2014-02-20 19:38:13.329427597 +1100
-+++ plymouth.patch/systemd-units/plymouth-quit.service.in	2014-02-20 19:40:52.619343839 +1100
++++ plymouth.patch/systemd-units/plymouth-quit.service.in      2014-02-20 19:40:52.619343839 +1100
 @@ -1,8 +1,9 @@
  [Unit]
  Description=Terminate Plymouth Boot Screen

plymouth-set-default-theme.in.patch

@@ -0,0 +1,15 @@
+diff -aur plymouth.src/scripts/plymouth-set-default-theme.in plymouth.patch/scripts/plymouth-set-default-theme.in
+--- plymouth.src/scripts/plymouth-set-default-theme.in       2014-02-20 19:38:13.319427393 +1100
++++ plymouth.patch/scripts/plymouth-set-default-theme.in      2014-02-20 19:54:13.035553244 +1100
+@@ -173,7 +173,10 @@
+         exit $?
+ fi
+ 
+-if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
++if [ -z ${THEME_NAME} ]; then
++        echo "Please specify a theme name"
++        exit 1
++elif [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
+         echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" >&2
+         exit 1
+ fi

plymouth-start.path

@@ -0,0 +1,10 @@
+[Unit]
+Description=Automatically Start Plymouth Boot Screen
+
+[Path]
+PathExistsGlob=/sys/class/graphics/fb*/device/drm/
+Unit=plymouth-start.service
+
+[Install]
+WantedBy=sysinit.target
+

plymouth-start.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Show Plymouth Boot Screen
+DefaultDependencies=no
+Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
+After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
+Before=systemd-ask-password-plymouth.service
+ConditionKernelCommandLine=!plymouth.enable=0
+
+[Service]
+ExecStart=/usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
+ExecStartPost=-/usr/bin/plymouth show-splash
+Type=forking
+RuntimeDirectory=plymouth
+KillMode=none
+SendSIGKILL=no
+
+[Install]
+WantedBy=sysinit.target

plymouth-update-initrd.patch

@@ -1,6 +1,6 @@
 diff -aur plymouth.src/scripts/plymouth-update-initrd plymouth.patch/scripts/plymouth-update-initrd
---- plymouth.src/scripts/plymouth-update-initrd	2014-02-20 19:38:13.319427393 +1100
+--- plymouth.src/scripts/plymouth-update-initrd        2014-02-20 19:38:13.319427393 +1100
-+++ plymouth.patch/scripts/plymouth-update-initrd	2014-02-20 19:54:13.035553244 +1100
++++ plymouth.patch/scripts/plymouth-update-initrd      2014-02-20 19:54:13.035553244 +1100
 @@ -1,2 +1,4 @@
  #!/bin/bash
 -dracut -f

plymouth.encrypt_hook

@@ -76,7 +76,7 @@ EOF
             if [ ${dopassphrase} -gt 0 ]; then
                 echo
                 echo "A password is required to access the ${cryptname} volume:"
-                plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}"
+                plymouth ask-for-password --prompt="Password for ${cryptname} volume" --dont-pause-progress --number-of-tries=5 --command="/sbin/cryptsetup luksOpen --key-file=- ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}"
                 sleep 2
             fi
             if [ -e "/dev/mapper/${cryptname}" ]; then

plymouth.initcpio_hook

@@ -1,29 +1,12 @@
-
-### former 'plymouth-git'
-
-#run_hook() {
-#        msg -n ":: Loading plymouth..."
-#
-#        /bin/mknod /dev/fb c 29 0 &>/dev/null
-#        #/bin/mount devpts /dev/pts -t devpts
-#
-#        # plymouth deamon
-#        #/bin/mkdir -p /run/plymouth
-#        /usr/sbin/plymouthd --mode=boot --pid-file=/var/run/plymouth/pid --attach-to-session
-#
-#        # plymouth frontend
-#        /usr/bin/plymouth --show-splash
-#        msg "done."
-#}
-
-### from stable 'plymouth'
-
 run_earlyhook(){
+        # first trigger graphics subsystem
         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
+        # first trigger graphics and tty subsystem
         udevadm trigger --action=add --subsystem-match=graphics --subsystem-match=drm --subsystem-match=tty >/dev/null 2>&1
+ 
         udevadm settle --timeout=30 2>&1
-
+       
-        /usr/bin/mknod /dev/fb c 29 &>/dev/null
+	/usr/bin/mknod /dev/fb c 29 &>/dev/null
         /usr/bin/mkdir -p /dev/pts
         /usr/bin/mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
         /usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session

plymouth.initcpio_install

@@ -1,7 +1,7 @@
 build() {
 	add_dir /dev/pts
 	add_dir /usr/share/plymouth/themes
-	add_dir /var/run/plymouth # <- needed?
+	add_dir /var/run/plymouth
 
 	DATADIR="/usr/share"
 	PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png"
@@ -20,7 +20,7 @@ build() {
 	add_file "${PLYMOUTH_LOGO_FILE}"
 	add_file /etc/os-release
 	add_file /etc/plymouth/plymouthd.conf
-    add_file ${DATADIR}/plymouth/plymouthd.defaults
+        add_file ${DATADIR}/plymouth/plymouthd.defaults
 
 	if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
 	    echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
@@ -33,12 +33,9 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-	    for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
+            add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
-		[ ! -f "$x" ] && break
-		add_file $x
-	    done
 	fi
-
+	
 	add_file /usr/lib/udev/rules.d/70-uaccess.rules
 	add_file /usr/lib/udev/rules.d/71-seat.rules
 

sd-plymouth.initcpio_install

@@ -36,10 +36,7 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-		for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
+                add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
-			[ ! -f "$x" ] && break
-			add_file $x
-		done
 	fi
 	
 	add_udev_rule 70-uaccess.rules

sddm-plymouth.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Simple Desktop Display Manager
+Documentation=man:sddm(1) man:sddm.conf(5)
+Conflicts=getty@tty1.service
+Wants=plymouth-deactivate.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/bin/sddm
+Restart=always
+
+[Install]
+Alias=display-manager.service

slim-plymouth.service

@@ -1,10 +1,13 @@
 [Unit]
 Description=SLiM Simple Login Manager
 Conflicts=getty@tty1.service plymouth-quit.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+Wants=plymouth-deactivate.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
 
 [Service]
 ExecStart=/usr/bin/slim -nodaemon
+Restart=always
+IgnoreSIGPIPE=no
 StandardOutput=syslog
 
 [Install]