Author: kelmo-guest
Date: Mon Jul 14 00:32:49 2008
New Revision: 771
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=771
Log:
Port debian/patches/64_missing_default_fields_fallback.dpatch from trunk
Added:
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
(with props)
Modified:
branches/insserv-1.11.9/debian/changelog
branches/insserv-1.11.9/debian/patches/00list
Modified: branches/insserv-1.11.9/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/changelog?rev=771&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/changelog (original)
+++ branches/insserv-1.11.9/debian/changelog Mon Jul 14 00:32:49 2008
@@ -17,7 +17,6 @@
- 51_overwrite_output.dpatch
- 52_shutdown_links.dpatch
- 60_disable_cfgfilter_stat.dpatch
- - 64_missing_default_fields_fallback.dpatch
* Discard patches not applied in series:
- 32_debug_option.dpatch
- 34_debian_fixedscripts.dpatch
@@ -27,8 +26,9 @@
- 42_loopnochangemsg.dpatch
- 62_warn_on_missing_required_fields.dpatch
- 63_warn_on_missing_default_fields.dpatch
-
- -- Kel Modderman <[EMAIL PROTECTED]> Wed, 09 Jul 2008 17:05:56 +1000
+ - 64_missing_default_fields_fallback.dpatch
+
+ -- Kel Modderman <[EMAIL PROTECTED]> Mon, 14 Jul 2008 10:31:59 +1000
insserv (1.11.0-9) unstable; urgency=low
Modified: branches/insserv-1.11.9/debian/patches/00list
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/00list?rev=771&op=diff
==============================================================================
--- branches/insserv-1.11.9/debian/patches/00list (original)
+++ branches/insserv-1.11.9/debian/patches/00list Mon Jul 14 00:32:49 2008
@@ -4,3 +4,4 @@
42_loopnochangemsg
62_warn_on_missing_required_fields
63_warn_on_missing_default_fields
+64_missing_default_fields_fallback.dpatch
Added:
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch?rev=771&op=file
==============================================================================
---
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
(added)
+++
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
Mon Jul 14 00:32:49 2008
@@ -1,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64_missing_default_fields_fallback.patch.dpatch by Kel Modderman <[EMAIL
PROTECTED]>
+##
+Goal: In the cases where Default-Start or Default-Stop are undefined for
+a script, assume runlevel links to be empty. If Default-Start is defined
+and empty, do not overwrite it. Likewise for Default-Stop.
+Fixes: none
+Status: Not applied to version 1.11.2. Need to improve patch and submit.
+
+test_no_default_start and test_no_default_stop expose these cases.
+
[EMAIL PROTECTED]@
+--- a/insserv.c
++++ b/insserv.c
+@@ -2796,8 +2796,10 @@
+ */
+ if (service->attr.flags & SERV_ENABLED)
+ script_inf.default_start =
lvl2str(service->start->lvl);
++#ifdef SUSE
+ else
+ script_inf.default_start =
xstrdup(DEFAULT_START_LVL);
++#endif
+ }
+ #ifdef SUSE
+ /*
+@@ -2839,19 +2841,34 @@
+ */
+ if (service->attr.flags & SERV_ENABLED)
+ script_inf.default_stop =
lvl2str(service->stopp->lvl);
++#ifdef SUSE
+ else
+ script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
++#endif
+ }
+ }
+ }
+ free(provides);
+ }
+
++#ifdef SUSE
+ /* Ahh ... set default multiuser with network */
+ if (!script_inf.default_start || script_inf.default_start == empty)
+ script_inf.default_start = xstrdup(DEFAULT_START_LVL);
+ if (!script_inf.default_stop || script_inf.default_start == empty)
+ script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
++#else
++ if (!script_inf.default_start) {
++ warn("Default-Start undefined, assuming empty start runlevel(s) for
script `%s'\n",
++ d->d_name);
++ script_inf.default_start = empty;
++ }
++ if (!script_inf.default_stop) {
++ warn("Default-Stop undefined, assuming empty stop runlevel(s) for
script `%s'\n",
++ d->d_name);
++ script_inf.default_stop = empty;
++ }
++#endif
+
+ if (chkfor(d->d_name, argv, argc) && !defaults && !del) {
+ if (argr[curr_argc]) {
Propchange:
branches/insserv-1.11.9/debian/patches/64_missing_default_fields_fallback.dpatch
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
