Author: kelmo-guest
Date: Wed Aug 20 10:44:36 2008
New Revision: 840
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=840
Log:
Improve 30_deterministic_order.dpatch
Modified:
trunk/src/insserv/debian/patches/30_deterministic_order.dpatch
Modified: trunk/src/insserv/debian/patches/30_deterministic_order.dpatch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/30_deterministic_order.dpatch?rev=840&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/30_deterministic_order.dpatch (original)
+++ trunk/src/insserv/debian/patches/30_deterministic_order.dpatch Wed Aug 20
10:44:36 2008
@@ -14,11 +14,22 @@
boolean del = false;
boolean defaults = false;
boolean ignore = false;
-+ boolean loadarg = argc;
++ boolean loadarg = false;
myname = basename(*argv);
-@@ -2490,17 +2491,45 @@
+@@ -2305,7 +2306,9 @@
+ argv += optind;
+ argc -= optind;
+
+- if (!argc && del)
++ if (argc)
++ loadarg = true;
++ else if (del)
+ error("usage: %s [[-r] init_script|init_directory]\n", myname);
+
+ if (*argv) {
+@@ -2490,17 +2493,45 @@
/*
* Scan now all scripts found in the init.d/ directory
*/
@@ -58,9 +69,9 @@
+ */
+ if (loadarg && !isarg)
+ continue;
-+ else if (loadarg && isarg && (curr_argc != 0))
++ if (loadarg && isarg && (curr_argc != 0))
+ continue;
-+ else if (!loadarg && isarg && (curr_argc == 0))
++ if (!loadarg && isarg && (curr_argc == 0))
+ continue;
+
if (*d->d_name == '.')
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
