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

[pere at alioth.debian.org]

Author: pere
Date: 2008-05-29 17:43:25 +0000 (Thu, 29 May 2008)
New Revision: 1280

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Optimize start symlinks as if they are stop symlinks for runlevels 0 and
    6, to avoid problems with portmap during shutdown (Closes: #483172).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-05-20 07:23:36 UTC (rev 1279)
+++ sysvinit/trunk/debian/changelog	2008-05-29 17:43:25 UTC (rev 1280)
@@ -1,3 +1,10 @@
+sysvinit (2.86.ds1-58) UNRELEASED; urgency=low
+
+  * Optimize start symlinks as if they are stop symlinks for runlevels 0 and
+    6, to avoid problems with portmap during shutdown (Closes: #483172).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 29 May 2008 19:42:06 +0200
+
 sysvinit (2.86.ds1-57) unstable; urgency=low
 
   * Remove another bashism in init.d/rc blocking startpar concurrency

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-05-20 07:23:36 UTC (rev 1279)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2008-05-29 17:43:25 UTC (rev 1280)
@@ -350,7 +350,14 @@
 				# and _no_ stop script in this level, we don't
 				# have to re-start the service.
 				#
-				[ -f $previous_start ] && [ ! -f $stop ] && continue
+				if [ start = "$ACTION" ] ; then
+				    [ -f $previous_start ] && [ ! -f $stop ] && continue
+				else
+				    # Workaround for the special
+				    # handling of runlevels 0 and 6.
+				    [ -f $previous_stop ] && [ ! -f $previous_start ] && continue
+				fi
+
 			fi
 			SCRIPTS="$SCRIPTS $i"
 		done