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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-23 09:44:54 +0000 (Sun, 23 Dec 2007)
New Revision: 1085

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
Log:
  * Rewrite init.d/rc to use shell features instead of calling sed
    (Closes #406393).  Patch from Ivan Baldo.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-23 09:35:18 UTC (rev 1084)
+++ sysvinit/trunk/debian/changelog	2007-12-23 09:44:54 UTC (rev 1085)
@@ -11,6 +11,8 @@
   * Implement noswap kernel boot option to stop automatic
     swap activation at boot time (Closes: #388525).  Based on patch
     from Michael Prokop.
+  * Rewrite init.d/rc to use shell features instead of calling sed
+    (Closes #406393).  Patch from Ivan Baldo.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 23 Dec 2007 10:03:48 +0100
 

Modified: sysvinit/trunk/debian/sysv-rc/etc/init.d/rc
===================================================================
--- sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-23 09:35:18 UTC (rev 1084)
+++ sysvinit/trunk/debian/sysv-rc/etc/init.d/rc	2007-12-23 09:44:54 UTC (rev 1085)
@@ -240,7 +240,9 @@
 		CURLEVEL=""
 		for s in /etc/rc$runlevel.d/K*
 		do
-			level=$(echo $s | sed 's/.*\/K\([0-9][0-9]\).*/\1/')
+			# Extract order value from symlink
+			level=${s#/etc/rc$runlevel.d/K}
+			level=${level%%[a-z]*}
 			if [ "$level" = "$CURLEVEL" ]
 			then
 				continue
@@ -278,7 +280,9 @@
 	CURLEVEL=""
 	for s in /etc/rc$runlevel.d/S*
 	do
-		level=$(echo $s | sed 's/.*\/S\([0-9][0-9]\).*/\1/')
+		# Extract order value from symlink
+		level=${s#/etc/rc$runlevel.d/S}
+		level=${level%%[a-z]*}
 		if [ "$level" = "$CURLEVEL" ]
 		then
 			continue