[Initscripts-ng-commits] r642 - in /trunk/src/insserv/debian: changelog patches/00list patches/52_shutdown_links.dpatch patches/53_debugoutput.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Sun Feb 24 22:40:40 2008
New Revision: 642

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=642
Log:
  * Added patch 52_shutdown_links to fix incorrecly inserted stop
    symlinks (Closes: #464017).
  * Added patch 53_debugoutput to provide more useful debug output
    used to track down the stop symlink issues.  Not enabled by default.

Added:
    trunk/src/insserv/debian/patches/52_shutdown_links.dpatch   (with props)
    trunk/src/insserv/debian/patches/53_debugoutput.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=642&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Feb 24 22:40:40 2008
@@ -5,6 +5,10 @@
   * Added patch 42_loopnochangemsg to change the message printed when
     a loop is detected, to let the user know that the boot sequence is
     untouched.
+  * Added patch 52_shutdown_links to fix incorrecly inserted stop
+    symlinks (Closes: #464017).
+  * Added patch 53_debugoutput to provide more useful debug output
+    used to track down the stop symlink issues.  Not enabled by default.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 21 Feb 2008 09:39:30 +0100
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=642&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Sun Feb 24 22:40:40 2008
@@ -8,3 +8,4 @@
 42_loopnochangemsg
 50_sign_warning
 51_overwrite_output
+52_shutdown_links

Added: trunk/src/insserv/debian/patches/52_shutdown_links.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/52_shutdown_links.dpatch?rev=642&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/52_shutdown_links.dpatch (added)
+++ trunk/src/insserv/debian/patches/52_shutdown_links.dpatch Sun Feb 24 22:40:40 2008
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_dshutdown_links.dpatch by Petter Reinholdtsen
+
+Make sure to not not insert unwanted stop symlinks for scripts that
+are already configured.  BTS issue #464017.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/insserv.c
++++ insserv-1.11.0/insserv.c
+@@ -2582,11 +2582,14 @@
+ 	     * default_stop arn't used in SuSE Linux.
+ 	     */
+ 	    if (script_inf.default_stop && script_inf.default_stop != empty) {
+-		if (service && !del)
+-		  {
+-		    service->lvlk = str2lvl(script_inf.default_stop);
+-		    runlevels(token, script_inf.default_stop);
+-		  }
++	        if (service) {
++		    if (service->lvlk) {
++		        runlevels(token, lvl2str(service->lvlk));
++		    } else if (!del) {
++		        service->lvlk = str2lvl(script_inf.default_stop);
++			runlevels(token, script_inf.default_stop);
++		    }
++		}
+ 	    }
+ #endif /* USE_STOP_TAGS */
+ 	}

Propchange: trunk/src/insserv/debian/patches/52_shutdown_links.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/src/insserv/debian/patches/53_debugoutput.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/53_debugoutput.dpatch?rev=642&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/53_debugoutput.dpatch (added)
+++ trunk/src/insserv/debian/patches/53_debugoutput.dpatch Sun Feb 24 22:40:40 2008
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_debugoutput.dpatch by Petter Reinholdtsen
+
+Provide more debug output to help finding bugs in insserv.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/listing.h
++++ insserv-1.11.0/listing.h
+@@ -136,7 +136,7 @@
+ #define xsymlink(x,y) ({ if ((dryrun ? 0 : (symlink(x, y) < 0))) \
+ 	warn ("can not symlink(%s, %s%s): %s\n", x, rcd, y, strerror(errno)); \
+ 	else \
+-	info("enable service %s -> %s/%s%s\n", x, path, rcd, y); })
++	info("enable service %s -> %s/%s%s %d\n", x, path, rcd, y, __LINE__); })
+ 
+ /*
+  * Bits of the runlevels
+--- insserv-1.11.0.orig/insserv.c
++++ insserv-1.11.0/insserv.c
+@@ -2911,6 +2914,10 @@
+ 	    if ((serv->lvls & lvl) == 0 && (serv->lvlk & lvl) == 0)
+ 		continue;		/* We aren't suppose to be on this runlevel */
+ 
++	    if (verbose)
++	        printf("S: %s K: %s\n", lvl2str(serv->lvls),
++		       lvl2str(serv->lvlk));
++
+ 	    sprintf(olink, "../init.d/%s", script);
+ 	    sprintf(nlink, "%c%.2d%s", mode, order, script);
+ 

Propchange: trunk/src/insserv/debian/patches/53_debugoutput.dpatch
------------------------------------------------------------------------------
    svn:executable = *