Author: kelmo-guest
Date: Tue Jul 22 16:48:35 2008
New Revision: 796
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=796
Log:
Clean up 81_debian_default_start_stop_warnings.patch for submission.
Modified:
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
Modified:
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
URL:
http://svn.debian.org/wsvn/initscripts-ng/branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch?rev=796&op=diff
==============================================================================
---
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
(original)
+++
branches/insserv-1.11.10/debian/patches/81_debian_default_start_stop_warnings.patch
Tue Jul 22 16:48:35 2008
@@ -1,21 +1,17 @@
-Print a warning when new link scheme intends to add start or stop links
-when empty runlevel configuration exists for currently active script.
-
-This is a cleanup of previously submitted patch.
+On Debian, print a warning when new link scheme intends to add start or stop
+links when runlevel configuration is empty for current script.
---
--- a/insserv.c
+++ b/insserv.c
-@@ -2774,18 +2774,30 @@
- * needed for enabling interactive services at
first time.
+@@ -2775,6 +2775,7 @@
*/
service->start->lvl = deflvls;
--
-- } else if (!script_inf.default_start) {
+
+#ifdef SUSE
-+ } else {
+ } else if (!script_inf.default_start) {
/*
* Could be a none LSB script, use info from current
link scheme.
- * If not found use default.
+@@ -2782,10 +2783,22 @@
*/
if (service->attr.flags & SERV_ENABLED)
script_inf.default_start =
lvl2str(service->start->lvl);
@@ -23,7 +19,7 @@
else
script_inf.default_start =
xstrdup(DEFAULT_START_LVL);
-#endif /* SUSE */
-+#else
++#else /* not SUSE, but Debian */
+ } else if (script_inf.default_start &&
script_inf.default_start == empty) {
+ if ((service->attr.flags & SERV_ENABLED) &&
service->start->lvl) {
+ /*
@@ -36,21 +32,19 @@
+ script_inf.default_start =
lvl2str(service->start->lvl);
+ }
+ }
-+#endif
++#endif /* not SUSE, but Debian */
}
#ifdef SUSE
/*
-@@ -2822,18 +2834,30 @@
- * needed for enabling interactive services at
first time.
+@@ -2823,6 +2836,7 @@
*/
service->stopp->lvl = deflvlk;
--
-- } else if (!script_inf.default_stop) {
+
+#ifdef SUSE
-+ } else {
+ } else if (!script_inf.default_stop) {
/*
* Could be a none LSB script, use info from current
link scheme.
- * If not found use default.
+@@ -2830,10 +2844,22 @@
*/
if (service->attr.flags & SERV_ENABLED)
script_inf.default_stop =
lvl2str(service->stopp->lvl);
@@ -58,7 +52,7 @@
else
script_inf.default_stop = xstrdup(DEFAULT_STOP_LVL);
-#endif /* SUSE */
-+#else
++#else /* not SUSE, but Debian */
+ } else if (script_inf.default_stop &&
script_inf.default_stop == empty) {
+ if ((service->attr.flags & SERV_ENABLED) &&
service->stopp->lvl) {
+ /*
@@ -71,7 +65,7 @@
+ script_inf.default_stop =
lvl2str(service->stopp->lvl);
+ }
+ }
-+#endif
++#endif /* not SUSE, but Debian */
}
}
}
_______________________________________________
Initscripts-ng-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/initscripts-ng-commits
