[Initscripts-ng-commits] r749 - in /trunk/src/insserv/debian: changelog patches/00list patches/64_missing_default_fields_fallback.dpatch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Mon May 19 14:31:31 2008
New Revision: 749

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=749
Log:
Add 64_missing_default_fields_fallback to ensure sane fallback of
empty runlevel configuration is used for scripts missing Default-
Start or Default-Stop lsb keywords.

Added:
    trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch   (with props)
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=749&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon May 19 14:31:31 2008
@@ -40,8 +40,11 @@
     Default-Stop  LSB comment keywords.
   * Add a note to new patches to relate them to a case function of the test
     suite.
-
- -- Kel Modderman <kel at otaku42.de>  Tue, 20 May 2008 00:19:55 +1000
+  * Add 64_missing_default_fields_fallback to ensure sane fallback of
+    empty runlevel configuration is used for scripts missing Default-
+    Start or Default-Stop lsb keywords.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 20 May 2008 00:29:08 +1000
 
 insserv (1.11.0-8) unstable; urgency=low
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=749&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Mon May 19 14:31:31 2008
@@ -13,3 +13,4 @@
 61_default_stop_changed_from_empty
 62_warn_on_missing_required_fields
 63_warn_on_missing_default_fields
+64_missing_default_fields_fallback

Added: trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch?rev=749&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch (added)
+++ trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch Mon May 19 14:31:31 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64_missing_default_fields_fallback.dpatch by Kel Modderman <kel at otaku42.de>
+##
+## DP: Goal: In the cases where Default-Start or Default-Stop are undefined for
+## DP: a script, assume runlevel links to be empty. If Default-Start is defined
+## DP: and empty, do not overwrite it. Likewise for Default-Stop.
+## DP:
+## DP: Fixes: none
+## DP:
+## DP: Status: Intend to submit upstream.
+## DP:
+## DP: Notes: test_no_default_start and test_no_default_stop should both expose
+## DP: this case, however it is noted that Default-Start seems to never be
+## DP: undefined (or even "empty") at this point in the code. Therefore
+## DP: currently only test_no_default_stop truly expose this case at this time.
+
+ at DPATCH@
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c	2008-05-20 00:04:28.000000000 +1000
++++ insserv/insserv.c	2008-05-20 00:10:18.509012955 +1000
+@@ -2551,12 +2551,17 @@
+ 	    free(provides);
+ 	}
+ 
+-	/* Ahh ... set default multiuser with network */
+-	if (!script_inf.default_start || script_inf.default_start == empty)
+-	    script_inf.default_start = xstrdup(DEFAULT_START_LVL);
++	if (!script_inf.default_start) {
++	    warn("Default-Start undefined, assuming empty start runlevel(s) for script `%s'\n",
++	         d->d_name);
++	    script_inf.default_start = empty;
++	}
+ #ifdef USE_STOP_TAGS
+-	if (!script_inf.default_stop  || script_inf.default_start == empty)
+-	    script_inf.default_stop  = xstrdup(DEFAULT_STOP_LVL);
++	if (!script_inf.default_stop) {
++	    warn("Default-Stop undefined, assuming empty stop runlevel(s) for script `%s'\n",
++	         d->d_name);
++	    script_inf.default_stop = empty;
++	}
+ #endif /* USE_STOP_TAGS */
+ 
+ 	if (chkfor(d->d_name, argv, argc) && !defaults) {

Propchange: trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
------------------------------------------------------------------------------
    svn:executable = *