Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-release-src > by-pkgid > 803d9641dacc6246d211f10a18104383 > files > 13

initscripts-9.55-24.mga6.src.rpm

diff -up initscripts-9.55/prefdm.forcekill initscripts-9.55/prefdm
--- initscripts-9.55/prefdm.forcekill	2016-11-30 14:37:25.000000000 +0100
+++ initscripts-9.55/prefdm	2016-11-30 14:40:00.000000000 +0100
@@ -19,6 +19,10 @@ if [ -f /etc/sysconfig/autologin -a -x /
 	if [ -n "$USER" -a "$AUTOLOGIN" = yes ]; then
 	    # shut down boot splash
 	    [ -x /bin/plymouth ] && /bin/plymouth quit
+	    # force shut down boot splash if not yet done
+	    if [ -n $(/bin/pidof plymouth) ]; then
+	    	/bin/pkill -SIGTERM plymouth
+	    fi
 	    /usr/sbin/autologin &
 	    echo -n $$ > /var/lock/subsys/dm
 	    wait $!
@@ -65,6 +69,10 @@ fi
 
 # shut down boot splash
 [ -x /bin/plymouth ] && [ "x$plymouth_quit" = "xyes" ] && /bin/plymouth quit
+# force shut down boot splash if not yet done
+if [ -n $(/bin/pidof plymouth) ]; then
+	/bin/pkill -SIGTERM plymouth
+fi
 
 shopt -s execfail
 
@@ -77,4 +85,8 @@ exec sddm "$@" >/dev/null 2>&1 </dev/nul
 
 # catch all exit error
 [ -x /bin/plymouth ] && /bin/plymouth quit
+# force shut down boot splash if not yet done
+if [ -n $(/bin/pidof plymouth) ]; then
+	/bin/pkill -SIGTERM plymouth
+fi
 exit 1