[Initscripts-ng-commits] r277 - /trunk/src/insserv/debian/patches/42_redundantlvl.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Nov 17 19:18:36 2007
New Revision: 277

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=277
Log:
Avoid messing with the bitmask handling.

Modified:
    trunk/src/insserv/debian/patches/42_redundantlvl.dpatch

Modified: trunk/src/insserv/debian/patches/42_redundantlvl.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/42_redundantlvl.dpatch?rev=277&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/42_redundantlvl.dpatch (original)
+++ trunk/src/insserv/debian/patches/42_redundantlvl.dpatch Sat Nov 17 19:18:36 2007
@@ -81,7 +81,7 @@
 -    {"../rc6.d/", LVL_REBOOT, LVL_NORM},
 -    {"../rcS.d/", LVL_BOOT,   LVL_BOOT}, /* runlevel S is for system initialization */
 +    {"../rc0.d/", LVL_HALT,   LVL_NORM, '0'},
-+    {"../rc1.d/", LVL_SINGLE, LVL_NORM, '1'}, /* runlevel 1 switch over to single user mode */
++    {"../rc1.d/", LVL_ONE,    LVL_NORM, '1'}, /* runlevel 1 switch over to single user mode */
 +    {"../rc2.d/", LVL_TWO,    LVL_NORM, '2'},
 +    {"../rc3.d/", LVL_THREE,  LVL_NORM, '3'},
 +    {"../rc4.d/", LVL_FOUR,   LVL_NORM, '4'},
@@ -243,27 +243,3 @@
      }
  
      return ret;
-@@ -623,21 +570,9 @@
-     unsigned int bit = 0x001;
- 
-     memset(ptr , '\0', sizeof(str));
--    for (num = 0; num < 9; num++) {
-+    for (num = 0; num < map_has_runlevels(); num++) {
- 	if (bit & lvl) {
--	    if (LVL_NORM & bit)
--		*(ptr++) = num + 48;
--#ifdef SUSE
--	    else if (LVL_SINGLE & bit)
--		*(ptr++) = 'S';
--	    else if (LVL_BOOT & bit)
--		*(ptr++) = 'B';
--#else
--	    else if (LVL_BOOT & bit)
--		*(ptr++) = 'S';
--#endif /* not SUSE */
--	    else
--		error("Wrong runlevel %d\n", num);
-+	    *(ptr++) = map_runlevel_to_key(num);
- 	    *(ptr++) = ' ';
- 	}
- 	bit <<= 1;