[Initscripts-ng-commits] r144 - in /trunk/src/insserv/debian: changelog patches/00list patches/38_debuginfo.dpatch patches/39_debianlvl.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Sep  7 22:08:28 2006
New Revision: 144

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=144
Log:
   * New upstream release.

Added:
    trunk/src/insserv/debian/patches/38_debuginfo.dpatch   (with props)
    trunk/src/insserv/debian/patches/39_debianlvl.dpatch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=144&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Sep  7 22:08:28 2006
@@ -9,6 +9,8 @@
   * Adjust build rules to use the compiler options specified in the rules
     file.
   * New patch 33_debian_localok, to accept script names like 'rc.local'.
+  * New patch 38_debuginfo to improve the debug output.
+  * New patch 39_debianlvl.dpatch to handle rcS.d/ a bit better.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu,  7 Sep 2006 12:47:39 +0200
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=144&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Thu Sep  7 22:08:28 2006
@@ -8,4 +8,6 @@
 35_fixunused
 36_memleak
 37_consistent_path
+38_debuginfo
+39_debianlvl
 #51_cfgfilter_dpkg

Added: trunk/src/insserv/debian/patches/38_debuginfo.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/38_debuginfo.dpatch?rev=144&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/38_debuginfo.dpatch (added)
+++ trunk/src/insserv/debian/patches/38_debuginfo.dpatch Thu Sep  7 22:08:28 2006
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 38_debuginfo.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+Change debug output to print symbolic runlevel names instead of a hex
+value with the bit pattern representing the runlevels.
+
+ at DPATCH@
+--- insserv-1.08.0.orig/listing.c
++++ insserv-1.08.0/listing.c
+@@ -410,11 +410,11 @@
+     list_for_each(tmp, d_start) {
+ 	dir_t * dir = getdir(tmp);
+ 	if (dir->script)
+-	    fprintf(stderr, "%.2d %s 0x%.2x (%s)\n",
+-		   dir->order, dir->script, dir->lvl, dir->name);
++	    fprintf(stderr, "%.2d %s '%s' (%s)\n",
++		   dir->order, dir->script, lvl2str(dir->lvl), dir->name);
+ 	else
+-	    fprintf(stderr, "%.2d %s 0x%.2x (%%%s)\n",
+-		   dir->order, dir->name, dir->lvl, *dir->name == '$' ? "system" : "guessed");
++	    fprintf(stderr, "%.2d %s '%s' (%%%s)\n",
++		   dir->order, dir->name, lvl2str(dir->lvl), *dir->name == '$' ? "system" : "guessed");
+     }
+ }
+ #endif

Propchange: trunk/src/insserv/debian/patches/38_debuginfo.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/src/insserv/debian/patches/39_debianlvl.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/39_debianlvl.dpatch?rev=144&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/39_debianlvl.dpatch (added)
+++ trunk/src/insserv/debian/patches/39_debianlvl.dpatch Thu Sep  7 22:08:28 2006
@@ -1,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 39_debianlvl.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+Adjust inssert to handle 'S' in the init.d script level list as the
+boot directory on debian.  A better solution would be to reengineer
+insserv to have the runlevel info in one location instead of all over
+the code.
+
+ at DPATCH@
+--- insserv-1.08.0.orig/insserv.c
++++ insserv-1.08.0/insserv.c
+@@ -418,7 +418,11 @@
+ 
+     switch (runlvl) {
+ 	case 0: serv->lvls |= LVL_HALT;   break;
++#ifdef SUSE
+ 	case 1: serv->lvls |= LVL_ONE;    break;
++#else /* not SUSE */
++	case 1: serv->lvls |= LVL_SINGLE; break;
++#endif
+ 	case 2: serv->lvls |= LVL_TWO;    break;
+ 	case 3: serv->lvls |= LVL_THREE;  break;
+ 	case 4: serv->lvls |= LVL_FOUR;   break;
+@@ -1133,6 +1137,7 @@
+     {"../rc4.d/", LVL_FOUR,   LVL_NORM},
+     {"../rc5.d/", LVL_FIVE,   LVL_NORM},
+     {"../rc6.d/", LVL_REBOOT, LVL_NORM},
++    {"../rc1.d/", LVL_ONE,    LVL_NORM}, /* placeholder */
+     {"../rcS.d/", LVL_BOOT,   LVL_BOOT}, /* runlevel S */
+ 		/* On e.g. Debian there exist no boot.d */
+ #endif		/* not SUSE */
+--- insserv-1.08.0.orig/listing.c
++++ insserv-1.08.0/listing.c
+@@ -578,9 +578,15 @@
+ 	if (!strpbrk(token, "0123456sSbB"))
+ 	    continue;
+ 	if (*token == 'S' || *token == 's')
++#ifdef SUSE
+ 	    num = 7;
++#else
++	    num = 8;
++#endif
++#ifdef SUSE
+ 	else if (*token == 'B' || *token == 'b')
+ 	    num = 8;
++#endif /* SUSE */
+ 	else
+ 	    num = atoi(token);
+ 	switch (num) {