[Initscripts-ng-commits] r316 - in /trunk/src/insserv/debian: changelog patches/00list patches/44_path_at_runtime.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Sat Dec 29 13:33:02 2007
New Revision: 316

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=316
Log:
  * New patch 44_path_at_runtime to add new option -p to make it
    possible to replace /etc/init.d with another path for testing.

Added:
    trunk/src/insserv/debian/patches/44_path_at_runtime.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=316&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sat Dec 29 13:33:02 2007
@@ -5,6 +5,8 @@
     without LSB header (Closes: #431697).
   * Update patch 43_shutdown to handle scripts with both start and
     stop levels.  (Closes: #452462).
+  * New patch 44_path_at_runtime to add new option -p to make it
+    possible to replace /etc/init.d with another path for testing.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 29 Dec 2007 00:20:04 +0100
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=316&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Sat Dec 29 13:33:02 2007
@@ -8,3 +8,4 @@
 41_debiandefault
 42_redundantlvl
 43_shutdown
+44_path_at_runtime

Added: trunk/src/insserv/debian/patches/44_path_at_runtime.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/44_path_at_runtime.dpatch?rev=316&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/44_path_at_runtime.dpatch (added)
+++ trunk/src/insserv/debian/patches/44_path_at_runtime.dpatch Sat Dec 29 13:33:02 2007
@@ -1,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 44_path_at_runtime.dpatch by Petter Reinholdtsen
+
+Make it possible to set the path at runtime, to make it easier to
+write test suites.
+
+ at DPATCH@
+--- insserv-1.09.0.orig/insserv.c
++++ insserv-1.09.0/insserv.c
+@@ -1480,6 +1480,7 @@
+     {"default",	0, NULL, 'd'},
+     {"remove",	0, NULL, 'r'},
+     {"force",	0, NULL, 'f'},
++    {"path",	0, NULL, 'p'},
+     {"help",	0, NULL, 'h'},
+     { 0,	0, NULL,  0 },
+ };
+@@ -1492,6 +1492,7 @@
+     printf("  -r, --remove     Remove the listed scripts from all runlevels.\n");
+     printf("  -f, --force      Ignore if a required service is missed.\n");
+     printf("  -v, --verbose    Provide information on what is being done.\n");
++    printf("  -p <path>, --path <path>  Path to replace " INITDIR ".\n");
+     printf("  -n, --dryrun     Do not change the system, only talk about it.\n");
+     printf("  -d, --default    Use default runlevels a defined in the scripts\n");
+ }
+@@ -1517,7 +1518,7 @@
+     for (c = 0; c < argc; c++)
+ 	argr[c] = NULL;
+ 
+-    while ((c = getopt_long(argc, argv, "dfrhvn", long_options, NULL)) != -1) {
++    while ((c = getopt_long(argc, argv, "dfrhvnp:", long_options, NULL)) != -1) {
+ 	switch (c) {
+ 	    case 'd':
+ 		defaults = true;
+@@ -1535,6 +1536,9 @@
+ 		verbose = true;
+ 		dryrun = true;
+ 		break;
++	    case 'p':
++		path = optarg;
++		break;
+ 	    case '?':
+ 		error("For help use: %s -h\n", myname);
+ 	    case 'h':
+--- insserv-1.09.0/insserv.8	2007-12-29 14:21:26.000000000 +0100
++++ insserv-1.09.0/insserv.8	2007-12-29 14:28:11.000000000 +0100
+@@ -15,16 +15,19 @@
+ .\"
+ .B insserv
+ .RB [ \-v ]
++.RB [ \-p\ <path> ]
+ .RB [ \-d ]
+ .RB [ \-f ]
+ .RI [[ / ] path/to/init.d/ ] script \ ...
+ .PP
+ .B insserv
+ .RB [ \-v ]
++.RB [ \-p\ <path> ]
+ .RI [[ / ] path/to/init.d/ ] script [ ,start=<lvl1> [ ,<lvl2> ]]\ ...
+ .PP
+ .B insserv
+ .RB [ \-v ]
++.RB [ \-p\ <path> ]
+ .B \-r
+ .RB [ \-d ]
+ .RB [ \-f ]
+@@ -168,12 +171,15 @@
+ this facility will be grouped into one starting order.
+ .\"
+ .SH OPTIONS
+-Currently there are only four options for
++Currently there are only five options for
+ .BR insserv .
+ .TP
+ .BR \-v ,\  \-\-verbose
+ Write out what is currently going on.
+ .TP
++.BR \-p\ <path>,\  \-\-path\ <path>
++Specify path to init.d directory.  Useful for testing.
++.TP
+ .BR \-n ,\  \-\-dryrun
+ Do not update symlinks.
+ .TP

Propchange: trunk/src/insserv/debian/patches/44_path_at_runtime.dpatch
------------------------------------------------------------------------------
    svn:executable = *