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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 16:31:39 +0000 (Fri, 08 Sep 2006)
New Revision: 881

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Avoid the new depend on lsb-base in sysv-rc, and use echo if it is missing.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 15:07:44 UTC (rev 880)
+++ sysvinit/trunk/debian/changelog	2006-09-08 16:31:39 UTC (rev 881)
@@ -14,8 +14,9 @@
     replace an exisitng rc.local file without warning the system
     admin. (Closes: #386418)
   * Mount /dev/pts/ with noexec,nosuid, as it is only used for device files.
-  * Print a message when enabling concurrent boot, specifying the
-    concurrency style.
+  * Change sysv-rc to print a message when enabling concurrent boot,
+    specifying the concurrency style.  Recommend lsb-base and use it
+    if available.
   * Teach init.d/stop-bootlogd-single to accept the kernel arguments
     'S' and '1' as well as 'single' as single-user mode triggers.
     (Closes: #367465, #372669)

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2006-09-08 15:07:44 UTC (rev 880)
+++ sysvinit/trunk/debian/control	2006-09-08 16:31:39 UTC (rev 881)
@@ -24,7 +24,7 @@
 
 Package: sysv-rc
 Architecture: all
-Depends: lsb-base (>= 3.0-6)
+Recommends: lsb-base (>= 3.0-6)
 Conflicts: file-rc
 Replaces: file-rc, sysvinit (<< 2.85-1)
 Suggests: sysv-rc-conf, bum

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-08 15:07:44 UTC (rev 880)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2006-09-08 16:31:39 UTC (rev 881)
@@ -65,7 +65,11 @@
 . /etc/default/rcS
 export VERBOSE
 
-. /lib/lsb/init-functions
+if [ -f /lib/lsb/init-functions ] ; then
+    . /lib/lsb/init-functions
+else
+    log_daemon_msg() { echo $@ }
+fi
 
 #
 # Stub to do progress bar ticks (currently just for usplash) on startup