Author: kelmo-guest
Date: Sun May 18 22:58:10 2008
New Revision: 743
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=743
Log:
Make 62_default_stop_no_defaults.dpatch more explicit, default_stop is empty if
not specified.
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/62_default_stop_no_defaults.dpatch
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=743&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun May 18 22:58:10 2008
@@ -25,12 +25,11 @@
test_adding_stop() and disallow overwritten initscript to create stop
links when none were present initially (Closes: #477415).
* Add 62_default_stop_no_defaults to inhibit initscripts from being "given"
- default stop links when none are wanted. Stop links should only be created
- when asked for, there are no really sane defaults.
+ default stop links when none are wanted.
* Add test_onlystart() test case to check we can insert scripts with empty
stop runlevel configuration.
- -- Kel Modderman <[EMAIL PROTECTED]> Mon, 19 May 2008 08:43:08 +1000
+ -- Kel Modderman <[EMAIL PROTECTED]> Mon, 19 May 2008 08:56:42 +1000
insserv (1.11.0-8) unstable; urgency=low
Modified: trunk/src/insserv/debian/patches/62_default_stop_no_defaults.dpatch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/62_default_stop_no_defaults.dpatch?rev=743&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/62_default_stop_no_defaults.dpatch
(original)
+++ trunk/src/insserv/debian/patches/62_default_stop_no_defaults.dpatch Sun May
18 22:58:10 2008
@@ -1,20 +1,21 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 62_default_stop_no_defaults.dpatch by Kel Modderman <[EMAIL PROTECTED]>
##
-## DP: Do not set default Default-Stop value for valid lsb scripts.
+## DP: Do not set default Default-Stop value.
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv~/insserv.c 2008-05-18 11:31:17.000000000 +1000
-+++ insserv/insserv.c 2008-05-18 11:33:47.000000000 +1000
-@@ -2550,10 +2550,6 @@
- /* Ahh ... set default multiuser with network */
+--- insserv~/insserv.c 2008-05-19 08:51:42.000000000 +1000
++++ insserv/insserv.c 2008-05-19 08:55:05.000000000 +1000
+@@ -2551,8 +2551,9 @@
if (!script_inf.default_start || script_inf.default_start == empty)
script_inf.default_start = xstrdup(DEFAULT_START_LVL);
--#ifdef USE_STOP_TAGS
+ #ifdef USE_STOP_TAGS
- if (!script_inf.default_stop || script_inf.default_start == empty)
- script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
--#endif /* USE_STOP_TAGS */
++ /* Do not set stop runlevel defaults */
++ if (!script_inf.default_stop)
++ script_inf.default_stop = empty;
+ #endif /* USE_STOP_TAGS */
if (chkfor(d->d_name, argv, argc) && !defaults) {
- if (argr[curr_argc]) {
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
