[Initscripts-ng-commits] r751 - /trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Mon May 19 15:33:24 2008
New Revision: 751

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=751
Log:
Update debian/patches/64_missing_default_fields_fallback.dpatch so that it consistenly handles both when Default-Start or Default-Stop are undefined.

Modified:
    trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch

Modified: trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch?rev=751&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch (original)
+++ trunk/src/insserv/debian/patches/64_missing_default_fields_fallback.dpatch Mon May 19 15:33:24 2008
@@ -9,27 +9,50 @@
 ## DP:
 ## DP: Status: Intend to submit upstream.
 ## DP:
-## DP: Notes: test_no_default_start and test_no_default_stop should both expose
-## DP: this case, however it is noted that Default-Start seems to never be
-## DP: undefined (or even "empty") at this point in the code. Therefore
-## DP: currently only test_no_default_stop truly expose this case at this time.
+## DP: Notes: test_no_default_start and test_no_default_stop expose these
+## DP: cases.
 
 @DPATCH@
 diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv~/insserv.c	2008-05-20 00:04:28.000000000 +1000
-+++ insserv/insserv.c	2008-05-20 00:10:18.509012955 +1000
-@@ -2551,12 +2551,17 @@
+--- insserv~/insserv.c	2008-05-20 01:25:58.969139522 +1000
++++ insserv/insserv.c	2008-05-20 01:29:12.302013184 +1000
+@@ -2503,9 +2503,6 @@
+ 			     * Could be a none LSB script, use info from current link scheme.
+ 			     */
+ 			    script_inf.default_stop = lvl2str(service->lvlk);
+-			/*
+-			 * Do _not_ set default stop levels
+-			 */
+ 		    }
+ #endif /* USE_STOP_TAGS */
+ 
+@@ -2540,23 +2537,29 @@
+ 			     * Could be a none LSB script, use info from current link scheme.
+ 			     */
+ 			    script_inf.default_start = lvl2str(service->lvls);
+-			else
+-			    /*
+-			     * Ahh ... set default multiuser with network
+-			     */
+-			    script_inf.default_start = xstrdup(DEFAULT_START_LVL);
+ 		    }
+ 		}
+ 	    }
  	    free(provides);
  	}
  
--	/* Ahh ... set default multiuser with network */
--	if (!script_inf.default_start || script_inf.default_start == empty)
++#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);
++		script_inf.default_start = xstrdup(DEFAULT_START_LVL);
++#else /* SUSE */
 +	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;
 +	}
++#endif /* Not SUSE */
  #ifdef USE_STOP_TAGS
 -	if (!script_inf.default_stop  || script_inf.default_start == empty)
 -	    script_inf.default_stop  = xstrdup(DEFAULT_STOP_LVL);