[Initscripts-ng-commits] r777 - in /branches/insserv-1.11.9/debian: changelog patches/31_debian_conf.patch patches/81_empty_stop_start_defaults_no_override.patch patches/series

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

Author: kelmo-guest
Date: Tue Jul 15 01:02:44 2008
New Revision: 777

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=777
Log:
* Add 81_empty_stop_start_defaults_no_override.patch to avoid treating
  script with empty Default-{Start,Stop} LSB keywords as non-LSB scripts.
* Refresh 31_debian_conf.patch.

Added:
    branches/insserv-1.11.9/debian/patches/81_empty_stop_start_defaults_no_override.patch
Modified:
    branches/insserv-1.11.9/debian/changelog
    branches/insserv-1.11.9/debian/patches/31_debian_conf.patch
    branches/insserv-1.11.9/debian/patches/series

Modified: branches/insserv-1.11.9/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=777&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Tue Jul 15 01:02:44 2008
@@ -34,8 +34,11 @@
   * Add 80_do_not_mangle_argv_pointer.patch to revert optimisation that
     modifies argv pointer and causes chkfor() function to be impotent
     thereafter, completely wrecking the test suite.
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 14 Jul 2008 20:27:02 +1000
+  * Add 81_empty_stop_start_defaults_no_override.patch to avoid treating
+    script with empty Default-{Start,Stop} LSB keywords as non-LSB scripts.
+  * Refresh 31_debian_conf.patch.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 15 Jul 2008 11:01:25 +1000
 
 insserv (1.11.0-9) unstable; urgency=low
 

Modified: branches/insserv-1.11.9/debian/patches/31_debian_conf.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/31_debian_conf.patch?rev=777&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/31_debian_conf.patch (original)
+++ branches/insserv-1.11.9/debian/patches/31_debian_conf.patch Tue Jul 15 01:02:44 2008
@@ -1,6 +1,5 @@
-diff -urNad insserv~/insserv.conf insserv/insserv.conf
---- insserv~/insserv.conf	2008-01-04 11:19:42.000000000 +0100
-+++ insserv/insserv.conf	2008-01-04 11:21:59.000000000 +0100
+--- a/insserv.conf
++++ b/insserv.conf
 @@ -1,29 +1,29 @@
  #
  # All local filesystems are mounted (done during boot phase)

Added: branches/insserv-1.11.9/debian/patches/81_empty_stop_start_defaults_no_override.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/81_empty_stop_start_defaults_no_override.patch?rev=777&op=file
==============================================================================
--- branches/insserv-1.11.9/debian/patches/81_empty_stop_start_defaults_no_override.patch (added)
+++ branches/insserv-1.11.9/debian/patches/81_empty_stop_start_defaults_no_override.patch Tue Jul 15 01:02:44 2008
@@ -1,0 +1,23 @@
+When Default-Start or Default-Stop value is empty, do not treat script
+as if it does not have LSB information.
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -2789,7 +2789,7 @@
+ 			     */
+ 			    service->start->lvl = deflvls;
+ 
+-		    } else {
++		    } else if (script_inf.default_start != empty) {
+ 			/*
+ 			 * Could be a none LSB script, use info from current link scheme.
+ 			 * If not found use default.
+@@ -2834,7 +2834,7 @@
+ 			     */
+ 			    service->stopp->lvl = deflvlk;
+ 
+-		    } else {
++		    } else if (script_inf.default_stop != empty) {
+ 			/*
+ 			 * Could be a none LSB script, use info from current link scheme.
+ 			 * If not found use default.

Modified: branches/insserv-1.11.9/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/series?rev=777&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/series (original)
+++ branches/insserv-1.11.9/debian/patches/series Tue Jul 15 01:02:44 2008
@@ -7,3 +7,4 @@
 64_missing_default_fields_fallback.patch
 70_test_suite_failed_count.patch
 80_do_not_mangle_argv_pointer.patch
+81_empty_stop_start_defaults_no_override.patch