[Pkg-sysvinit-commits] r1276 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[pere at alioth.debian.org]

Author: pere
Date: 2008-05-20 07:16:13 +0000 (Tue, 20 May 2008)
New Revision: 1276

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
Log:
  * Remove special case handling of splash screens in sendsigs.
    The usplash and splashy packages are expected to use the
    omitpid feature now.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-05-20 06:45:30 UTC (rev 1275)
+++ sysvinit/trunk/debian/changelog	2008-05-20 07:16:13 UTC (rev 1276)
@@ -14,6 +14,9 @@
     user space file systems, by not stat()-ing files when killing
     processes during shutdown (Closes: #476695).  Patch from Goswin
     von Brederlow.
+  * Remove special case handling of splash screens in sendsigs.
+    The usplash and splashy packages are expected to use the
+    omitpid feature now.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 19 May 2008 08:26:01 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2008-05-20 06:45:30 UTC (rev 1275)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2008-05-20 07:16:13 UTC (rev 1276)
@@ -12,7 +12,6 @@
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
 . /lib/lsb/init-functions
-. /lib/init/splash-functions-base
 
 do_stop () {
 	OMITPIDS=
@@ -77,21 +76,6 @@
 	fi
 }
 
-splash_back() {
-    # Restore splash if it was enabled and killed by do_stop
-    [ -f /proc/cmdline ] && for x in $(cat /proc/cmdline); do
-	case $x in
-	splash*)
-	    SPLASH=true;
-	    ;;
-	esac
-    done
-
-    [ "$SPLASH" = "true" ] || return 0
-
-    splash_start
-}
-
 case "$1" in
   start)
 	# No-op
@@ -102,7 +86,6 @@
 	;;
   stop)
 	do_stop
-	splash_back
 	;;
   *)
 	echo "Usage: $0 start|stop" >&2