[Initscripts-ng-commits] r467 - /trunk/src/insserv/debian/patches/43_shutdown.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Mon Jan  7 17:29:28 2008
New Revision: 467

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=467
Log:
Remove patch relative to unreleased test patch.

Modified:
    trunk/src/insserv/debian/patches/43_shutdown.dpatch

Modified: trunk/src/insserv/debian/patches/43_shutdown.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/43_shutdown.dpatch?rev=467&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/43_shutdown.dpatch (original)
+++ trunk/src/insserv/debian/patches/43_shutdown.dpatch Mon Jan  7 17:29:28 2008
@@ -5,9 +5,9 @@
 Fix the handling of stop scripts and the shutdown sequence.
 
 @DPATCH@
-diff -urNad insserv-1.10.0~/insserv.c insserv-1.10.0/insserv.c
---- insserv-1.10.0~/insserv.c	2008-01-07 17:51:13.000000000 +0100
-+++ insserv-1.10.0/insserv.c	2008-01-07 17:55:55.000000000 +0100
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c	2008-01-07 18:24:26.000000000 +0100
++++ insserv/insserv.c	2008-01-07 18:24:34.000000000 +0100
 @@ -468,14 +468,19 @@
  /*
   * This helps us to work out the current symbolic link structure
@@ -61,34 +61,7 @@
  
  		if (service->opts & SERV_KNOWN)
  		    continue;
-@@ -1522,7 +1529,7 @@
- 		    warn("script %s provides system facility %s, skipped!\n", d->d_name, token);
- 		    continue;
- 		}
--		service = current_structure(token, order, runlevel);
-+		service = current_structure(token, order, runlevel, type);
- 
- 		if (service->opts & SERV_KNOWN)
- 		    continue;
-@@ -1544,7 +1551,7 @@
- 		    warn("script %s provides system facility %s, skipped!\n", d->d_name, token);
- 		    continue;
- 		}
--		service = current_structure(token, order, runlevel);
-+		service = current_structure(token, order, runlevel, type);
- 
- 		if (service->opts & SERV_KNOWN)
- 		    continue;
-@@ -1566,7 +1573,7 @@
- 		    warn("script %s provides system facility %s, skipped!\n", d->d_name, token);
- 		    continue;
- 		}
--		service = current_structure(token, order, runlevel);
-+		service = current_structure(token, order, runlevel, type);
- 
- 		if (service->opts & SERV_KNOWN)
- 		    continue;
-@@ -2445,7 +2452,10 @@
+@@ -2393,7 +2400,10 @@
  	     */
  	    if (script_inf.default_stop && script_inf.default_stop != empty) {
  		if (service && !del)
@@ -99,7 +72,7 @@
  	    }
  #endif /* not SUSE */
  	}
-@@ -2726,10 +2736,14 @@
+@@ -2674,10 +2684,14 @@
  	}
  
  	while (listscripts(&script, seek)) {
@@ -116,7 +89,7 @@
  	    int order = getorder(script);
  	    boolean found;
  	    char * clink;
-@@ -2752,6 +2766,10 @@
+@@ -2700,6 +2714,10 @@
  		order = (maxorder + 1) - order;
  	    }
  
@@ -127,9 +100,9 @@
  	    sprintf(olink, "../init.d/%s", script);
  	    sprintf(nlink, "%c%.2d%s", mode, order, script);
  
-diff -urNad insserv-1.10.0~/listing.c insserv-1.10.0/listing.c
---- insserv-1.10.0~/listing.c	2008-01-07 17:51:13.000000000 +0100
-+++ insserv-1.10.0/listing.c	2008-01-07 17:51:21.000000000 +0100
+diff -urNad insserv~/listing.c insserv/listing.c
+--- insserv~/listing.c	2008-01-07 18:24:26.000000000 +0100
++++ insserv/listing.c	2008-01-07 18:24:34.000000000 +0100
 @@ -536,7 +536,7 @@
  {
      dir_t * dir = providedir(this);