[Initscripts-ng-commits] r597 - in /trunk/src/insserv/debian: changelog patches/00list patches/51_overwrite_output.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Fri Feb  8 16:01:35 2008
New Revision: 597

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=597
Log:
  * New patch 51_overwrite_output to improve output when symlinks on
    disk do not match the default-* headers.

Added:
    trunk/src/insserv/debian/patches/51_overwrite_output.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=597&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri Feb  8 16:01:35 2008
@@ -19,6 +19,8 @@
   * New patch 32_debug_option to add new option -D to print debug
     output.
   * New patch 33_nosuse_scripts to disable some SUSE specific. 
+  * New patch 51_overwrite_output to improve output when symlinks on
+    disk do not match the default-* headers.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  1 Feb 2008 19:45:46 +0100
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=597&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Fri Feb  8 16:01:35 2008
@@ -5,3 +5,4 @@
 33_nosuse_scripts
 40_segfault_virtprov
 50_sign_warning
+51_overwrite_output

Added: trunk/src/insserv/debian/patches/51_overwrite_output.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/51_overwrite_output.dpatch?rev=597&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/51_overwrite_output.dpatch (added)
+++ trunk/src/insserv/debian/patches/51_overwrite_output.dpatch Fri Feb  8 16:01:35 2008
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_overwrite_output.dpatch by Petter Reinholdtsen
+
+Include more information when overwriting the provide LSB defaults.
+
+ at DPATCH@
+diff -u insserv-1.11.0/insserv.c insserv-1.11.0/insserv.c
+--- insserv-1.11.0/insserv.c
++++ insserv-1.11.0/insserv.c
+@@ -2460,8 +2460,9 @@
+ 			     */
+ 			    if (!defaults && (deflvls != service->lvls)) {
+ 				if (!del && chkfor(d->d_name, argv, argc) && !(argr[curr_argc]))
+-				    warn("Warning, current runlevel(s) of script `%s' overwrites defaults.\n",
+-					 d->d_name);
++				    warn("Warning, current start runlevel(s) of script `%s' (%s) overwrites defaults (%s).\n",
++					 d->d_name, lvl2str(service->lvls),
++					 lvl2str(deflvls));
+ 			    }
+ 			} else
+ 			    /*
+@@ -2500,8 +2509,9 @@
+ 			     */
+ 			    if (!defaults && (deflvlk != service->lvlk)) {
+ 				if (!del && chkfor(d->d_name, argv, argc) && !(argr[curr_argc]))
+-				    warn("Warning, current runlevel(s) of script `%s' overwrites defaults.\n",
+-					 d->d_name);
++				    warn("Warning, current stop runlevel(s) of script `%s' (%s) overwrites defaults (%s).\n",
++					 d->d_name, lvl2str(service->lvlk),
++					 lvl2str(deflvlk));
+ 			    }
+ 			} else
+ 			    /*

Propchange: trunk/src/insserv/debian/patches/51_overwrite_output.dpatch
------------------------------------------------------------------------------
    svn:executable = *