Author: kelmo-guest
Date: Mon May 3 06:48:36 2010
New Revision: 1052
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1052
Log:
Add 21_tweak_warnings.patch to make insserv warn about differing on
disk state/LSB runlevel info for the script(s) in its argument list.
(Closes: #578308)
Added:
trunk/src/insserv/debian/patches/21_tweak_warnings.patch
Modified:
trunk/src/insserv/debian/changelog
trunk/src/insserv/debian/patches/series
Modified: trunk/src/insserv/debian/changelog
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1052&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Mon May 3 06:48:36 2010
@@ -1,3 +1,11 @@
+insserv (1.14.0-2) UNRELEASED; urgency=low
+
+ * Add 21_tweak_warnings.patch to make insserv warn about differing on
+ disk state/LSB runlevel info for the script(s) in its argument list.
+ (Closes: #578308)
+
+ -- Kel Modderman <[email protected]> Mon, 03 May 2010 16:43:25 +1000
+
insserv (1.14.0-1) unstable; urgency=low
[ Petter Reinholdtsen ]
Added: trunk/src/insserv/debian/patches/21_tweak_warnings.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_tweak_warnings.patch?rev=1052&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/21_tweak_warnings.patch (added)
+++ trunk/src/insserv/debian/patches/21_tweak_warnings.patch Mon May 3
06:48:36 2010
@@ -1,0 +1,30 @@
+Description: only emit warnings about overriding LSB default with symlink
+ state for the scripts in insserv arg list.
+From: Kel Modderman <[email protected]>
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -3100,8 +3100,9 @@ int main (int argc, char *argv[])
+ * of the current script.
+ */
+ if (!defaults && service->start->lvl != 0) {
+- warn("warning: current start runlevel(s) (%s)
of script `%s' overwrites defaults (empty).\n",
+- lvl2str(service->start->lvl), d->d_name);
++ if (!del && isarg && !(argr[curr_argc]))
++ warn("warning: current start runlevel(s)
(%s) of script `%s' overwrites defaults (empty).\n",
++ lvl2str(service->start->lvl),
d->d_name);
+ script_inf.default_start =
lvl2str(service->start->lvl);
+ }
+ }
+@@ -3162,8 +3163,9 @@ int main (int argc, char *argv[])
+ * of the current script.
+ */
+ if (!defaults && service->stopp->lvl != 0) {
+- warn("warning: current stop runlevel(s) (%s) of
script `%s' overwrites defaults (empty).\n",
+- lvl2str(service->stopp->lvl), d->d_name);
++ if (!del && isarg && !(argr[curr_argc]))
++ warn("warning: current stop runlevel(s)
(%s) of script `%s' overwrites defaults (empty).\n",
++ lvl2str(service->stopp->lvl),
d->d_name);
+ script_inf.default_stop =
lvl2str(service->stopp->lvl);
+ }
+ }
Modified: trunk/src/insserv/debian/patches/series
URL:
http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1052&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Mon May 3 06:48:36 2010
@@ -1,4 +1,5 @@
10_nosuse.patch
11_debian_conf.patch
20_manpage_spelling.patch
+21_tweak_warnings.patch
92_m68k_alignment.patch
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
