[Pkg-sysvinit-commits] r1088 - in sysvinit/trunk/debian: . sysv-rc/etc/init.d

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-23 13:12:58 +0000 (Sun, 23 Dec 2007)
New Revision: 1088

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Make sure sysv-rc do not depend on the new progress bar API
    in initscripts to work properly (Closes: #457544).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-23 11:06:02 UTC (rev 1087)
+++ sysvinit/trunk/debian/changelog	2007-12-23 13:12:58 UTC (rev 1088)
@@ -15,6 +15,8 @@
     (Closes #406393).  Patch from Ivan Baldo.
   * Fix typo in update-rc.d example code (Closes: #433378).
   * Fix minor typo in rc*.d/README files (Closes: #452384).
+  * Make sure sysv-rc do not depend on the new progress bar API
+    in initscripts to work properly (Closes: #457544).
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 23 Dec 2007 10:03:48 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-23 11:06:02 UTC (rev 1087)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-23 13:12:58 UTC (rev 1088)
@@ -42,6 +42,9 @@
 # Functions for splash progress bars
 if [ -e /lib/init/splash-functions-base ] ; then
     . /lib/init/splash-functions-base
+else
+    # Quiet down script if old initscripts version without /lib/init/splash-functions-base is used.
+    splash_progress() { return 1; }
 fi
 
 # Now find out what the current and what the previous runlevel are.