[Initscripts-ng-commits] r426 - in /trunk/src/insserv/debian: changelog patches/00list patches/34_debian_fixedscripts.dpatch patches/40_nosusescript.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Jan  2 18:17:21 2008
New Revision: 426

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=426
Log:
  * UNRELEASED.
  * New patch 34_debian_fixedscripts to hardcode a few script sequence
    numbers, to let the generated boot sequence be more like the
    original one.  Modified 40_nonsusescripts to no longer disable the
    setlsb() function.

Added:
    trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch   (with props)
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list
    trunk/src/insserv/debian/patches/40_nosusescript.dpatch

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=426&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Wed Jan  2 18:17:21 2008
@@ -1,3 +1,14 @@
+insserv (1.09.0-12) unstable; urgency=low
+
+  * UNRELEASED.
+
+  * New patch 34_debian_fixedscripts to hardcode a few script sequence
+    numbers, to let the generated boot sequence be more like the
+    original one.  Modified 40_nonsusescripts to no longer disable the
+    setlsb() function.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed,  2 Jan 2008 18:41:31 +0100
+
 insserv (1.09.0-11) unstable; urgency=low
 
   * Added test to demonstrate the fake loop warning issue (bug

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=426&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Wed Jan  2 18:17:21 2008
@@ -5,6 +5,7 @@
 31_debian_conf
 32_debian_nolsb
 33_debian_localok
+34_debian_fixedscripts
 38_debuginfo
 40_nosusescript
 41_debiandefault

Added: trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch?rev=426&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch (added)
+++ trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch Wed Jan  2 18:17:21 2008
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 34_debian_fixedscripts.dpatch by Petter Reinholdtsen
+
+Provide default sequence numbers for a few well known scripts, to make
+the generated boot sequence more closely match the original one.
+
+ at DPATCH@
+--- insserv-1.09.0.orig/insserv.c
++++ insserv-1.09.0/insserv.c
+@@ -2110,6 +2110,16 @@
+     setorder("boot.setup", 20, false);
+ 
+     /*
++     * Debian scripts with well known sequence numbers.  Not sure if
++     * we want to fix all of these.
++     */
++    setorder("checkroot.sh",	10, false); setlsb("checkroot.sh");
++    setorder("checkfs.sh",	30, false); setlsb("checkfs.sh");
++    setorder("networking",	40, false); setlsb("networking.sh");
++    setorder("mountnfs.sh",	45, false); setlsb("mountnfs.sh");
++    setorder("single",		90, false); setlsb("single");
++
++    /*
+      * Set virtual dependencies for already enabled none LSB scripts.
+      */
+     nonlsb_script();

Propchange: trunk/src/insserv/debian/patches/34_debian_fixedscripts.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/src/insserv/debian/patches/40_nosusescript.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/40_nosusescript.dpatch?rev=426&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/40_nosusescript.dpatch (original)
+++ trunk/src/insserv/debian/patches/40_nosusescript.dpatch Wed Jan  2 18:17:21 2008
@@ -7,21 +7,6 @@
 @DPATCH@
 --- insserv-1.08.0.orig/insserv.c	2007-11-21 17:30:08.000000000 +0100
 +++ insserv-1.08.0/insserv.c	2007-11-21 17:30:33.000000000 +0100
-@@ -438,12 +438,14 @@
-     return serv;
- }
- 
-+#ifdef SUSE
- static void setlsb(const char* const name)
- {
-     serv_t * serv = findserv(name);
-     if (serv)
- 	serv->opts &= ~SERV_NOTLSB;
- }
-+#endif /* SUSE */
- 
- /*
-  * This helps us to set none LSB conform scripts to required
 @@ -1824,6 +1824,7 @@
  	/* main scanner for LSB comment in current script */
  	lsb = scan_script_defaults(d->d_name);