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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-25 18:46:36 +0000 (Tue, 25 Dec 2007)
New Revision: 1110

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Reduce redundant code in init.d/rc, to make it easier to enable
sourcing of *.sh scripts.


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-25 18:42:32 UTC (rev 1109)
+++ sysvinit/trunk/debian/changelog	2007-12-25 18:46:36 UTC (rev 1110)
@@ -5,8 +5,11 @@
   * Change XS-Vcs-Svn to Vcs-Svn as the control flags are official now.
   * Add Vcs-Browser flag in debian/control, documenting the browsable source.
   * Change how init.d/rc call scripts, to make sure sourced scripts
-    get the correct argument string.  It is still not safe to source
-    scripts, as some of them use exit and terminate the boot.
+    get the correct argument.  It is still not possible to source
+    scripts, as some of them use exit and terminate the boot.  This is
+    related to bug #339955.
+  * Reduce redundant code in init.d/rc, to make it easier to enable
+    sourcing of *.sh scripts.
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 24 Dec 2007 14:07:51 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-25 18:42:32 UTC (rev 1109)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-25 18:46:36 UTC (rev 1110)
@@ -80,6 +80,12 @@
     $debug splash_progress "$progress" || true
 }
 
+sh=sh
+# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
+# However, some important packages currently contain .sh scripts
+# that do "exit" at some point, thus killing this process.  Bad!
+#[ S = "$runlevel" ] && sh=.
+
 #
 # Start script or program.
 #
@@ -90,11 +96,6 @@
 		action=$1
 		shift
 		scripts="$@"
-		sh=sh
-		# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
-		# However, some important packages currently contain .sh scripts
-		# that do "exit" at some point, thus killing this process.  Bad!
-		#[ S = "$runlevel" ] && sh=.
 		backgrounded=0
 		for script in $scripts ; do
 			case "$script" in
@@ -126,11 +127,6 @@
 		action=$1
 		shift
 		scripts="$@"
-		sh=sh
-		# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
-		# However, some important packages currently contain .sh scripts
-		# that do "exit" at some point, thus killing this process.  Bad!
-		#[ S = "$runlevel" ] && sh=.
 		# Make sure .sh scripts are sourced in runlevel S
 		if [ "." = "$sh" ] ; then
 			newscripts=
@@ -164,11 +160,6 @@
 		action=$1
 		shift
 		scripts="$@"
-		sh=sh
-		# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
-		# However, some important packages currently contain .sh scripts
-		# that do "exit" at some point, thus killing this process.  Bad!
-		#[ S = "$runlevel" ] && sh=.
 		for script in $scripts ; do
 			case "$script" in
 			  *.sh)