Author: kelmo-guest
Date: Sun Sep 21 15:26:02 2008
New Revision: 865
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=865
Log:
* Add 60_all_keyword_start_only.dpatch to prevent Required-Stop: $all
from modifying start link sort order.
* Make test_early_all() test suite function unconditionally fatal,
this is an importan bug fixed by 60_all_keyword_start_only.dpatch.
Added:
trunk/src/insserv/debian/patches/60_all_keyword_start_only.dpatch
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/00list
trunk/src/insserv/debian/run-testsuite
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=865&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Sun Sep 21 15:26:02 2008
@@ -4,7 +4,13 @@
* New test test_early_all to control that $all only affect start or
stop sequences. Trying to reproduce issue reported in #485307.
- -- Petter Reinholdtsen <[EMAIL PROTECTED]> Sun, 21 Sep 2008 07:28:58 +0200
+ [ Kel Modderman ]
+ * Add 60_all_keyword_start_only.dpatch to prevent Required-Stop: $all
+ from modifying start link sort order.
+ * Make test_early_all() test suite function unconditionally fatal,
+ this is an importan bug fixed by 60_all_keyword_start_only.dpatch.
+
+ -- Kel Modderman <[EMAIL PROTECTED]> Mon, 22 Sep 2008 01:24:50 +1000
insserv (1.12.0-3) unstable; urgency=low
Modified: trunk/src/insserv/debian/patches/00list
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=865&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Sun Sep 21 15:26:02 2008
@@ -3,3 +3,4 @@
30_deterministic_order
40_badboy_segfault
50_symlink_in_initddir
+60_all_keyword_start_only
Added: trunk/src/insserv/debian/patches/60_all_keyword_start_only.dpatch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/60_all_keyword_start_only.dpatch?rev=865&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/60_all_keyword_start_only.dpatch (added)
+++ trunk/src/insserv/debian/patches/60_all_keyword_start_only.dpatch Sun Sep
21 15:26:02 2008
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_all_keyword_start_only.patch by Kel Modderman <[EMAIL PROTECTED]>
+##
+## DP: Purpose: Prevent Required-Stop: $all from modifying start links
+## DP: Fixes: #485307
+## DP: Status: Work in progress.
+
[EMAIL PROTECTED]@
+--- a/insserv.c
++++ b/insserv.c
+@@ -291,8 +291,13 @@
+ break;
+ case '$':
+ if (strcasecmp(token, "$all") == 0) {
+- serv->attr.flags |= SERV_ALL;
+- break;
++ if (bit & REQ_KILL) {
++ /* $all has no effect on stop sort order */
++ break;
++ } else {
++ serv->attr.flags |= SERV_ALL;
++ break;
++ }
+ }
+ /* Expand the `$' token recursively down */
+ list_for_each(ptr, sysfaci_start) {
Modified: trunk/src/insserv/debian/run-testsuite
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/run-testsuite?rev=865&op=diff
==============================================================================
--- trunk/src/insserv/debian/run-testsuite (original)
+++ trunk/src/insserv/debian/run-testsuite Sun Sep 21 15:26:02 2008
@@ -1751,7 +1751,7 @@
check_script_present 2 early
check_script_present 2 complex
check_order 2 early complex
-${severity}_order 2 complex center
+check_order 2 complex center
check_order 0 complex late
}
##########################################################################
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
