[Initscripts-ng-commits] r140 - in /trunk/src/insserv/debian: changelog patches/00list patches/37_consistent_path.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Sep  7 16:55:13 2006
New Revision: 140

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

Added:
    trunk/src/insserv/debian/patches/37_consistent_path.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=140&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Thu Sep  7 16:55:13 2006
@@ -1,10 +1,11 @@
-insserv (1.08.0-4) unstable; urgency=low
+insserv (1.08.0-4~1) unstable; urgency=low
 
   * Change update-bootsystem-insserv to refuse to convert the boot
     system if there are dependency loops.
   * Make sketch implementation for enabling the dependency based boot
     system using a debconf question when the insserv package is
     installed.
+  * New patch 37_consistent_path to make more consistent lot output.
 
  -- 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=140&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Thu Sep  7 16:55:13 2006
@@ -6,4 +6,5 @@
 #34_debian
 35_fixunused
 36_memleak
+37_consistent_path
 #51_cfgfilter_dpkg

Added: trunk/src/insserv/debian/patches/37_consistent_path.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/37_consistent_path.dpatch?rev=140&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/37_consistent_path.dpatch (added)
+++ trunk/src/insserv/debian/patches/37_consistent_path.dpatch Thu Sep  7 16:55:13 2006
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 37_consistent_path.dpatch by Petter Reinholdtsen <pere at hungry.com>
+
+Make sure the following invocations of insserv uses the same path to
+init.d/:
+
+  insserv -nv
+  insserv -nv /etc/init.d
+  insserv -nv /etc/init.d/
+  insserv -nv /etc/init.d/hostname.sh
+
+Without this patch, they will use '/etc/init.d' and /etc/init.d/'
+respectively, and this produces strange paths in the log output.
+
+It was sent upstream 2006-09-07.
+
+ at DPATCH@
+--- insserv-1.08.0.orig/insserv.c
++++ insserv-1.08.0/insserv.c
+@@ -1651,7 +1651,15 @@
+ 	}
+ 
+ 	if (S_ISDIR(st_script.st_mode)) {
+-	    path = *argv;
++
++	    /* Remove trailing slash from the directory path */
++	    if ('/' == (*argv)[strlen(*argv)-1]) {
++	        char * ptr = xstrdup(*argv);
++	        ptr[strlen(ptr)-1] = '\0';
++		path = ptr;
++	    } else
++		path = *argv;
++
+ 	    if (del)
+ 		error("usage: %s [[-r] init_script|init_directory]\n", myname);
+ 	    argv++;
+@@ -1662,7 +1670,7 @@
+ 	    char * base, * ptr = xstrdup(*argv);
+ 
+ 	    if ((base = strrchr(ptr, '/'))) {
+-		*(++base) = '\0';
++		*(base) = '\0';
+ 		path = ptr;
+ 	    } else
+ 		free(ptr);

Propchange: trunk/src/insserv/debian/patches/37_consistent_path.dpatch
------------------------------------------------------------------------------
    svn:executable = *