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

[Petter Reinholdtsen]

Author: pere
Date: 2006-08-01 18:26:20 +0000 (Tue, 01 Aug 2006)
New Revision: 814

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
Log:
  * Rewrite usplash reactivation code in init.d/sendsigs to match the
    code in Ubuntu.  It need to behave the same way as the usplash
    startup code, and should not match the code deciding if
    usplash_write should be used.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-07-26 22:54:01 UTC (rev 813)
+++ sysvinit/trunk/debian/changelog	2006-08-01 18:26:20 UTC (rev 814)
@@ -3,6 +3,10 @@
   * Fix emergency mode's tty, making sure ^C and ^Z work when booting
     with 'emergency' kernel option.  Patch from Samuel
     Thibault. (Closes: #374543)
+  * Rewrite usplash reactivation code in init.d/sendsigs to match the
+    code in Ubuntu.  It need to behave the same way as the usplash
+    startup code, and should not match the code deciding if
+    usplash_write should be used.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 26 Jul 2006 11:37:23 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-07-26 22:54:01 UTC (rev 813)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-08-01 18:26:20 UTC (rev 814)
@@ -26,14 +26,14 @@
 
 splash_back() {
     # Restore usplash if it was enabled and killed by do_stop
+    for x in $(cat /proc/cmdline); do
+	case $x in
+	splash*)
+            SPLASH=true;
+	    ;;
+        esac
+    done
 
-    # Decide if usplash progress bar should be activated or not.
-    if type usplash_write >/dev/null 2>&1; then
-	SPLASH=true
-    else
-	SPLASH=false
-    fi
-
     [ "$SPLASH" = "true" ] || return 0
 
     if [ -x /sbin/usplash ]; then