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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-24 17:41:03 +0000 (Thu, 24 Nov 2005)
New Revision: 256

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
Don't source .sh scripts for now

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-24 17:15:03 UTC (rev 255)
+++ sysvinit/trunk/debian/changelog	2005-11-24 17:41:03 UTC (rev 256)
@@ -3,7 +3,10 @@
   *** DO NOT UPLOAD, see #339955 for details ***
 
   [ Petter Reinholdtsen ]
-  * Make sure to source *.sh scripts for runlevel 'S'.  (Closes: #339955)
+  * Add commented-out code to /etc/init.d/rc for sourcing
+    *.sh scripts for runlevel 'S'.  This is preparation for fixing
+    #339955.  Actually fixing it has to wait until other packages
+    remove "exit" from their .sh scripts.
 
   [ Thomas Hood ]
   * *.sh: Fix usage messages

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-24 17:15:03 UTC (rev 255)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2005-11-24 17:41:03 UTC (rev 256)
@@ -36,7 +36,9 @@
 	scripts="$@"
 	sh=sh
 	# Debian Policy §9.3.1 requires .sh scripts in runlevel S to be sourced
-	[ S = "$runlevel" ] && sh=.
+	# However, some important packages currently contain .sh scripts
+	# that do "exit" at some point, thus killing this process.  Bad!
+	#[ S = "$runlevel" ] && sh=.
 	case "$CONCURRENCY" in
 	  none)
 		for script in $scripts ; do