[Pkg-sysvinit-commits] r1061 - in sysvinit/trunk/debian: . initscripts/lib/init

[pere at alioth.debian.org]

Author: pere
Date: 2007-11-18 21:36:19 +0000 (Sun, 18 Nov 2007)
New Revision: 1061

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/lib/init/vars.sh
Log:
Make /lib/init/vars.sh usable when 'set -e' is in effect.  Patch from Ubuntu.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-11-18 13:36:30 UTC (rev 1060)
+++ sysvinit/trunk/debian/changelog	2007-11-18 21:36:19 UTC (rev 1061)
@@ -5,6 +5,8 @@
   * Move /etc/init.d/bootclean to /lib/init/bootclean, as it is not an
     init.d script but a library.
   * Acknowledge NMU. (Closes: #433386)
+  * Make /lib/init/vars.sh usable when 'set -e' is in effect.  Patch
+    from Ubuntu.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 30 Jan 2007 23:14:04 +0100
 

Modified: sysvinit/trunk/debian/initscripts/lib/init/vars.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2007-11-18 13:36:30 UTC (rev 1060)
+++ sysvinit/trunk/debian/initscripts/lib/init/vars.sh	2007-11-18 21:36:19 UTC (rev 1061)
@@ -2,7 +2,7 @@
 # Set rcS vars
 #
 
-[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/rcS ] && . /etc/default/rcS || true
 
 # Accept the same 'quiet' option as the kernel
 if [ ! -e /proc/cmdline ] || egrep -qw 'quiet' /proc/cmdline ; then
@@ -11,4 +11,4 @@
 
 # But allow both rcS and the kernel options 'quiet' to be overrided
 # when INIT_VERBOSE=yes is used as well.
-[ "$INIT_VERBOSE" ] && VERBOSE="$INIT_VERBOSE"
+[ "$INIT_VERBOSE" ] && VERBOSE="$INIT_VERBOSE" || true