[Initscripts-ng-commits] r436 - /trunk/src/insserv/debian/patches/
pere at users.alioth.debian.org
pere at users.alioth.debian.org
Fri Jan 4 10:26:09 UTC 2008
Author: pere
Date: Fri Jan 4 10:26:08 2008
New Revision: 436
URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=436
Log:
Update all patches to use current offset and code as their base.
Modified:
trunk/src/insserv/debian/patches/11_revdepend.dpatch
trunk/src/insserv/debian/patches/20_path_at_runtime.dpatch
trunk/src/insserv/debian/patches/21_overrides.dpatch
trunk/src/insserv/debian/patches/31_debian_conf.dpatch
trunk/src/insserv/debian/patches/32_debian_nolsb.dpatch
trunk/src/insserv/debian/patches/33_debian_localok.dpatch
trunk/src/insserv/debian/patches/40_nosusescript.dpatch
trunk/src/insserv/debian/patches/41_debiandefault.dpatch
trunk/src/insserv/debian/patches/42_redundantlvl.dpatch
trunk/src/insserv/debian/patches/43_shutdown.dpatch
trunk/src/insserv/debian/patches/44_reportloopmemb.dpatch
Modified: trunk/src/insserv/debian/patches/11_revdepend.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/11_revdepend.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/11_revdepend.dpatch (original)
+++ trunk/src/insserv/debian/patches/11_revdepend.dpatch Fri Jan 4 10:26:08 2008
@@ -6,9 +6,10 @@
review.
@DPATCH@
---- insserv-1.10.0/insserv.c 2007-12-29 19:39:07.000000000 +0100
-+++ insserv-1.10.0/insserv.c 2007-11-21 18:26:47.000000000 +0100
-@@ -57,12 +59,16 @@
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:19:42.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:21:53.000000000 +0100
+@@ -57,12 +57,16 @@
/* The main regular search expressions */
#define PROVIDES COMM "provides" VALUE
#define REQUIRED COMM "required"
@@ -26,7 +27,7 @@
#define DEFAULT_START DEFAULT START VALUE
#define DEFAULT_STOP DEFAULT STOP VALUE
#define DESCRIPTION COMM "description" VALUE
-@@ -90,6 +99,8 @@
+@@ -90,6 +94,8 @@
char *required_stop;
char *should_start;
char *should_stop;
@@ -35,7 +36,7 @@
char *default_start;
char *default_stop;
char *description;
-@@ -102,6 +113,8 @@
+@@ -102,6 +108,8 @@
regex_t req_stop;
regex_t shl_start;
regex_t shl_stop;
@@ -44,7 +45,7 @@
regex_t def_start;
regex_t def_stop;
regex_t desc;
-@@ -283,7 +296,7 @@
+@@ -283,7 +291,7 @@
/*
* Remember requests for required or should services and expand `$' token
*/
@@ -53,7 +54,7 @@
{
char * token, * tmp = strdupa(required);
list_t * ptr;
-@@ -349,6 +360,39 @@
+@@ -349,6 +357,39 @@
}
}
@@ -93,7 +94,7 @@
/*
* Check required services for name
*/
-@@ -950,6 +1040,8 @@
+@@ -950,6 +991,8 @@
regcompiler(®.req_stop, REQUIRED_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.shl_start, SHOULD_START, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.shl_stop, SHOULD_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
@@ -102,7 +103,7 @@
regcompiler(®.def_start, DEFAULT_START, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.def_stop, DEFAULT_STOP, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
regcompiler(®.desc, DESCRIPTION, REG_EXTENDED|REG_ICASE|REG_NEWLINE);
-@@ -968,6 +1060,8 @@
+@@ -968,6 +1011,8 @@
#define required_stop script_inf.required_stop
#define should_start script_inf.should_start
#define should_stop script_inf.should_stop
@@ -111,7 +112,7 @@
#define default_start script_inf.default_start
#define default_stop script_inf.default_stop
#define description script_inf.description
-@@ -983,6 +1077,8 @@
+@@ -983,6 +1028,8 @@
xreset(required_stop);
xreset(should_start);
xreset(should_stop);
@@ -120,7 +121,7 @@
xreset(default_start);
xreset(default_stop);
xreset(description);
-@@ -1034,6 +1140,22 @@
+@@ -1034,6 +1081,22 @@
should_stop = empty;
}
#endif /* not SUSE */
@@ -143,7 +144,7 @@
if (!default_start && regexecutor(®.def_start, COMMON_ARGS) == true) {
if (val->rm_so < val->rm_eo) {
*(pbuf+val->rm_eo) = '\0';
-@@ -1101,6 +1223,8 @@
+@@ -1101,6 +1164,8 @@
#undef required_stop
#undef should_start
#undef should_stop
@@ -152,7 +153,7 @@
#undef default_start
#undef default_stop
#undef description
-@@ -1115,6 +1239,8 @@
+@@ -1115,6 +1180,8 @@
regfree(®.req_stop);
regfree(®.shl_start);
regfree(®.shl_stop);
@@ -161,7 +162,7 @@
regfree(®.def_start);
regfree(®.def_stop);
regfree(®.desc);
-@@ -1234,6 +1367,9 @@
+@@ -1234,6 +1301,9 @@
rememberreq(service, REQ_SHLD, script_inf.should_start);
requiresv(token, script_inf.should_start);
}
@@ -171,7 +172,7 @@
#ifndef SUSE
/*
* required_stop and should_stop arn't used in SuSE Linux.
-@@ -1248,6 +1384,9 @@
+@@ -1248,6 +1318,9 @@
rememberreq(service, REQ_SHLD, script_inf.should_stop);
requiresv(token, script_inf.should_stop);
}
@@ -181,7 +182,7 @@
#endif /* not SUSE */
}
script_inf.provides = begin;
-@@ -1257,6 +1396,8 @@
+@@ -1257,6 +1330,8 @@
xreset(script_inf.required_stop);
xreset(script_inf.should_start);
xreset(script_inf.should_stop);
@@ -190,7 +191,7 @@
xreset(script_inf.default_start);
xreset(script_inf.default_stop);
xreset(script_inf.description);
-@@ -1867,7 +2026,7 @@
+@@ -1867,7 +1942,7 @@
boolean known = (service->opts & SERV_KNOWN);
service->opts |= SERV_KNOWN;
@@ -199,7 +200,7 @@
const char * script = getscript(service->name);
if (script) {
-@@ -1913,6 +2072,14 @@
+@@ -1913,6 +1988,14 @@
}
#endif /* not SUSE */
}
@@ -214,7 +215,7 @@
/*
* Use information from symbolic link structure to
* check if all services are around for this script.
-@@ -2082,6 +2249,8 @@
+@@ -2082,6 +2165,8 @@
xreset(script_inf.required_stop);
xreset(script_inf.should_start);
xreset(script_inf.should_stop);
Modified: trunk/src/insserv/debian/patches/20_path_at_runtime.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/20_path_at_runtime.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/20_path_at_runtime.dpatch (original)
+++ trunk/src/insserv/debian/patches/20_path_at_runtime.dpatch Fri Jan 4 10:26:08 2008
@@ -5,8 +5,9 @@
write test suites.
@DPATCH@
---- insserv-1.09.0.orig/insserv.8
-+++ insserv-1.09.0/insserv.8
+diff -urNad insserv~/insserv.8 insserv/insserv.8
+--- insserv~/insserv.8 2008-01-04 11:19:42.000000000 +0100
++++ insserv/insserv.8 2008-01-04 11:21:56.000000000 +0100
@@ -15,16 +15,22 @@
.\"
.B insserv
@@ -51,9 +52,10 @@
.BR \-n ,\ \-\-dryrun
Do not update symlinks.
.TP
---- insserv-1.09.0.orig/insserv.c
-+++ insserv-1.09.0/insserv.c
-@@ -1392,14 +1392,18 @@
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:21:56.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:21:56.000000000 +0100
+@@ -1467,14 +1467,18 @@
return 1;
}
@@ -75,7 +77,7 @@
n = scandir(dir, &namelist, cfgfile_filter, alphasort);
if(n > 0)
-@@ -1476,10 +1480,12 @@
+@@ -1551,10 +1555,12 @@
static struct option long_options[] =
{
{"verbose", 0, NULL, 'v'},
@@ -88,7 +90,7 @@
{"help", 0, NULL, 'h'},
{ 0, 0, NULL, 0 },
};
-@@ -1492,6 +1498,8 @@
+@@ -1567,6 +1573,8 @@
printf(" -r, --remove Remove the listed scripts from all runlevels.\n");
printf(" -f, --force Ignore if a required service is missed.\n");
printf(" -v, --verbose Provide information on what is being done.\n");
@@ -97,7 +99,7 @@
printf(" -n, --dryrun Do not change the system, only talk about it.\n");
printf(" -d, --default Use default runlevels a defined in the scripts\n");
}
-@@ -1507,6 +1515,7 @@
+@@ -1582,6 +1590,7 @@
struct stat st_script;
char * argr[argc];
char * path = INITDIR;
@@ -105,7 +107,7 @@
int runlevel, c;
boolean del = false;
boolean defaults = false;
-@@ -1517,8 +1526,11 @@
+@@ -1592,8 +1601,11 @@
for (c = 0; c < argc; c++)
argr[c] = NULL;
@@ -118,7 +120,7 @@
case 'd':
defaults = true;
break;
-@@ -1535,6 +1547,9 @@
+@@ -1610,6 +1622,9 @@
verbose = true;
dryrun = true;
break;
@@ -128,7 +130,7 @@
case '?':
error("For help use: %s -h\n", myname);
case 'h':
-@@ -1632,7 +1647,7 @@
+@@ -1707,7 +1722,7 @@
/*
* Scan and set our configuration for virtual services.
*/
Modified: trunk/src/insserv/debian/patches/21_overrides.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/21_overrides.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/21_overrides.dpatch (original)
+++ trunk/src/insserv/debian/patches/21_overrides.dpatch Fri Jan 4 10:26:08 2008
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad insserv~/insserv.c insserv/insserv.c
---- insserv-1.09.0~/insserv.c 2008-01-04 11:12:27.000000000 +0100
-+++ insserv-1.09.0/insserv.c 2008-01-04 11:13:20.000000000 +0100
+--- insserv~/insserv.c 2008-01-04 11:21:58.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:21:58.000000000 +0100
@@ -23,6 +23,7 @@
#include <fcntl.h>
#include <sys/stat.h>
Modified: trunk/src/insserv/debian/patches/31_debian_conf.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/31_debian_conf.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/31_debian_conf.dpatch (original)
+++ trunk/src/insserv/debian/patches/31_debian_conf.dpatch Fri Jan 4 10:26:08 2008
@@ -7,8 +7,9 @@
## DP: script names.
@DPATCH@
---- insserv-1.00.8.orig/insserv.conf
-+++ insserv-1.00.8/insserv.conf
+diff -urNad insserv~/insserv.conf insserv/insserv.conf
+--- insserv~/insserv.conf 2008-01-04 11:19:42.000000000 +0100
++++ insserv/insserv.conf 2008-01-04 11:21:59.000000000 +0100
@@ -1,29 +1,29 @@
#
# All local filesystems are mounted (done during boot phase)
@@ -43,8 +44,8 @@
+$syslog +syslog +sysklogd
#
- # All network daemons are running (this entry is OBSOLETE)
-@@ -38,9 +39,9 @@
+ # SunRPC portmapper available
+@@ -33,9 +33,9 @@
#
# The system time has been set correctly
#
Modified: trunk/src/insserv/debian/patches/32_debian_nolsb.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/32_debian_nolsb.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/32_debian_nolsb.dpatch (original)
+++ trunk/src/insserv/debian/patches/32_debian_nolsb.dpatch Fri Jan 4 10:26:08 2008
@@ -7,9 +7,10 @@
## DP: functions. These are in other packages on debian.
@DPATCH@
---- insserv-1.00.8.orig/Makefile
-+++ insserv-1.00.8/Makefile
-@@ -74,15 +74,15 @@
+diff -urNad insserv~/Makefile insserv/Makefile
+--- insserv~/Makefile 2008-01-04 11:22:01.000000000 +0100
++++ insserv/Makefile 2008-01-04 11:22:01.000000000 +0100
+@@ -75,15 +75,15 @@
$(MKDIR) $(SBINDIR)
$(MKDIR) $(SDOCDIR)
$(MKDIR) $(CONFDIR)
Modified: trunk/src/insserv/debian/patches/33_debian_localok.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/33_debian_localok.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/33_debian_localok.dpatch (original)
+++ trunk/src/insserv/debian/patches/33_debian_localok.dpatch Fri Jan 4 10:26:08 2008
@@ -6,9 +6,21 @@
2.86.ds1-15.
@DPATCH@
---- insserv-1.08.0.orig/insserv.c
-+++ insserv-1.08.0/insserv.c
-@@ -1362,8 +1367,7 @@
+diff -urNad insserv~/insserv.8 insserv/insserv.8
+--- insserv~/insserv.8 2008-01-04 11:22:02.000000000 +0100
++++ insserv/insserv.8 2008-01-04 11:22:02.000000000 +0100
+@@ -269,7 +269,6 @@
+ .sp 1
+ .in +1l
+ .nf
+- *.local
+ *.rpm*
+ *.ba*
+ *.old
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:22:02.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:22:02.000000000 +0100
+@@ -1545,8 +1545,7 @@
const char* end;
if ((end = strrchr(d->d_name, '.'))) {
end++;
@@ -18,13 +30,3 @@
!strncmp(end, "ba", 2) || /* .bak, .backup, ... */
!strcmp(end, "old") ||
!strcmp(end, "new") ||
---- insserv-1.08.0.orig/insserv.8.orig 2006-09-08 01:11:30.000000000 +0200
-+++ insserv-1.08.0/insserv.8 2006-09-08 01:11:35.000000000 +0200
-@@ -235,7 +235,6 @@
- .sp 1
- .in +1l
- .nf
-- *.local
- *.rpm*
- *.ba*
- *.old
Modified: trunk/src/insserv/debian/patches/40_nosusescript.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/40_nosusescript.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/40_nosusescript.dpatch (original)
+++ trunk/src/insserv/debian/patches/40_nosusescript.dpatch Fri Jan 4 10:26:08 2008
@@ -5,17 +5,18 @@
avoid fixing the sequence number for a lot of scripts used in SuSe.
@DPATCH@
---- insserv-1.08.0.orig/insserv.c 2007-11-21 17:30:08.000000000 +0100
-+++ insserv-1.08.0/insserv.c 2007-11-21 17:30:33.000000000 +0100
-@@ -1824,6 +1824,7 @@
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:22:05.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:22:05.000000000 +0100
+@@ -1926,6 +1926,7 @@
/* main scanner for LSB comment in current script */
- lsb = scan_script_defaults(d->d_name);
+ lsb = scan_script_defaults(d->d_name, override_path);
+#ifdef SUSE
/* Common script ... */
if (!strcmp(d->d_name, "halt")) {
makeprov("halt", d->d_name);
-@@ -1920,6 +1921,7 @@
+@@ -1952,6 +1953,7 @@
rememberreq(serv, REQ_SHLD, "kbd");
continue;
}
@@ -23,7 +24,7 @@
/*
* Oops, no comment found, guess one
-@@ -2206,6 +2208,7 @@
+@@ -2289,6 +2291,7 @@
expand_conf();
@@ -31,7 +32,7 @@
/*
* Set initial order of some services
*/
-@@ -2207,6 +2210,7 @@
+@@ -2300,6 +2303,7 @@
setorder("serial", 10, false); setlsb("serial");
setorder("gpm", 20, false); setlsb("gpm");
setorder("boot.setup", 20, false);
Modified: trunk/src/insserv/debian/patches/41_debiandefault.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/41_debiandefault.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/41_debiandefault.dpatch (original)
+++ trunk/src/insserv/debian/patches/41_debiandefault.dpatch Fri Jan 4 10:26:08 2008
@@ -5,11 +5,12 @@
runlevel 016.
@DPATCH@
---- insserv-1.08.0.orig/insserv.c
-+++ insserv-1.08.0/insserv.c
-@@ -34,6 +34,14 @@
- static const int map_runlevel_to_lvl (const int runlevel) __attribute__ ((unused));
- static const int map_runlevel_to_seek(const int runlevel) __attribute__ ((unused));
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:22:07.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:22:07.000000000 +0100
+@@ -37,6 +37,14 @@
+ static const int map_runlevel_to_seek(const int runlevel);
+ #endif /* not SUSE */
+#ifdef SUSE
+#define DEFAULT_START_LVL "3 5"
@@ -22,7 +23,7 @@
#ifndef INITDIR
# define INITDIR "/etc/init.d"
#endif
-@@ -1940,7 +1948,7 @@
+@@ -2162,7 +2170,7 @@
/*
* Ahh ... set default multiuser with network
*/
@@ -31,7 +32,7 @@
}
#ifndef SUSE
/*
-@@ -2086,15 +2095,12 @@
+@@ -2208,15 +2216,12 @@
free(begin);
}
Modified: trunk/src/insserv/debian/patches/42_redundantlvl.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/42_redundantlvl.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/42_redundantlvl.dpatch (original)
+++ trunk/src/insserv/debian/patches/42_redundantlvl.dpatch Fri Jan 4 10:26:08 2008
@@ -10,9 +10,9 @@
in it.
@DPATCH@
---- insserv-1.09.0.orig/insserv.c
-+++ insserv-1.09.0/insserv.c
-@@ -31,8 +31,8 @@
+--- insserv-1.09.0~/insserv.c 2008-01-04 11:22:09.000000000 +0100
++++ insserv-1.09.0/insserv.c 2008-01-04 11:22:09.000000000 +0100
+@@ -32,8 +32,8 @@
#include "listing.h"
static const char *map_runlevel_to_location(const int runlevel);
@@ -22,7 +22,7 @@
static const int map_runlevel_to_seek(const int runlevel);
#endif /* not SUSE */
-@@ -418,22 +418,7 @@
+@@ -471,22 +471,7 @@
if (serv->order < order)
serv->order = order;
@@ -46,7 +46,7 @@
return serv;
}
-@@ -1224,45 +1209,82 @@
+@@ -1304,45 +1289,82 @@
char *location;
const int lvl;
const int seek;
@@ -148,8 +148,8 @@
return runlevel_locations[runlevel].seek;
}
#endif /* not SUSE */
---- insserv-1.09.0.orig/listing.c
-+++ insserv-1.09.0/listing.c
+--- insserv-1.09.0~/listing.c 2008-01-04 11:22:09.000000000 +0100
++++ insserv-1.09.0/listing.c 2008-01-04 11:22:09.000000000 +0100
@@ -58,6 +58,9 @@
#define DIR_LOOP 0x00000002
#define DIR_ISACTIVE 0x00000004
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=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/43_shutdown.dpatch (original)
+++ trunk/src/insserv/debian/patches/43_shutdown.dpatch Fri Jan 4 10:26:08 2008
@@ -4,9 +4,10 @@
Fix the handling of stop scripts and the shutdown sequence.
@DPATCH@
---- insserv-1.09.0.orig/insserv.c
-+++ insserv-1.09.0/insserv.c
-@@ -420,14 +420,19 @@
+diff -urNad insserv~/insserv.c insserv/insserv.c
+--- insserv~/insserv.c 2008-01-04 11:22:10.000000000 +0100
++++ insserv/insserv.c 2008-01-04 11:22:11.000000000 +0100
+@@ -464,14 +464,19 @@
/*
* This helps us to work out the current symbolic link structure
*/
@@ -28,7 +29,7 @@
return serv;
}
-@@ -1310,11 +1278,17 @@
+@@ -1392,11 +1397,17 @@
while ((d = readdir(rcdir)) != NULL) {
char * ptr = d->d_name;
char order = 0;
@@ -47,7 +48,7 @@
ptr++;
if (strspn(ptr, "0123456789") < 2)
-@@ -1338,7 +1312,7 @@
+@@ -1420,7 +1431,7 @@
warn("script %s provides system facility %s, skipped!\n", d->d_name, token);
continue;
}
@@ -56,7 +57,7 @@
if (service->opts & SERV_KNOWN)
continue;
-@@ -2184,7 +2158,10 @@
+@@ -2294,7 +2305,10 @@
*/
if (script_inf.default_stop && script_inf.default_stop != empty) {
if (service && !del)
@@ -67,7 +68,7 @@
}
#endif /* not SUSE */
}
-@@ -2468,9 +2445,13 @@
+@@ -2571,9 +2585,13 @@
}
while (listscripts(&script, seek)) {
@@ -82,7 +83,7 @@
const char mode = (stop ? 'K' : 'S');
int order = getorder(script);
boolean found;
-@@ -2474,6 +2474,10 @@
+@@ -2597,6 +2615,10 @@
order = (maxorder + 1) - order;
}
@@ -93,9 +94,10 @@
sprintf(olink, "../init.d/%s", script);
sprintf(nlink, "%c%.2d%s", mode, order, script);
---- insserv-1.09.0.orig/listing.c
-+++ insserv-1.09.0/listing.c
-@@ -566,7 +566,7 @@
+diff -urNad insserv~/listing.c insserv/listing.c
+--- insserv~/listing.c 2008-01-04 11:22:10.000000000 +0100
++++ insserv/listing.c 2008-01-04 11:22:11.000000000 +0100
+@@ -536,7 +536,7 @@
{
dir_t * dir = providedir(this);
Modified: trunk/src/insserv/debian/patches/44_reportloopmemb.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/44_reportloopmemb.dpatch?rev=436&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/44_reportloopmemb.dpatch (original)
+++ trunk/src/insserv/debian/patches/44_reportloopmemb.dpatch Fri Jan 4 10:26:08 2008
@@ -7,17 +7,18 @@
loops present in the dependency graph.
@DPATCH@
---- insserv-1.09.0.orig/listing.c
-+++ insserv-1.09.0/listing.c
+diff -urNad insserv~/listing.c insserv/listing.c
+--- insserv~/listing.c 2008-01-04 11:22:12.000000000 +0100
++++ insserv/listing.c 2008-01-04 11:22:12.000000000 +0100
@@ -57,6 +57,7 @@
#define DIR_SCAN 0x00000001
#define DIR_LOOP 0x00000002
#define DIR_ISACTIVE 0x00000004
+#define DIR_LOOPREPORT 0x00000008
- /*
- * Provide or find a service dir, set initial states and
-@@ -194,11 +195,12 @@
+ /* From insserv.c */
+ extern const int map_has_runlevels(void);
+@@ -197,11 +198,12 @@
#define loop_check(a) \
((a) && (a)->flags & DIR_LOOP)
@@ -31,7 +32,7 @@
static boolean warned = false;
if (dir->flags & DIR_SCAN) {
-@@ -210,7 +212,7 @@
+@@ -213,7 +215,7 @@
if (!remembernode(dir))
loop_warn_one(dir);
}
@@ -40,7 +41,7 @@
}
if (deep < dir->minord) /* Default order deep of this tree is higher */
-@@ -220,7 +222,7 @@
+@@ -223,7 +225,7 @@
if (!warned)
warn("Max recursions depth %d reached\n", MAX_DEEP);
warned = true;
@@ -49,7 +50,7 @@
}
for (loop = 0, tmp = dir; tmp; loop++, tmp = getlinkdir(&(tmp->link))) {
-@@ -290,23 +292,33 @@
+@@ -293,23 +295,33 @@
if (!remembernode(skip) || !remembernode(tmp))
loop_warn_two(skip, tmp);
recursion = false;
@@ -85,7 +86,7 @@
}
#undef loop_warn_two
-@@ -316,10 +328,10 @@
+@@ -319,10 +331,10 @@
/*
* Helper for follow_all: start with depth one.
*/
@@ -98,7 +99,7 @@
}
/*
-@@ -383,7 +395,7 @@
+@@ -386,7 +398,7 @@
* Follow all scripts and calculate the main ordering.
*/
list_for_each(tmp, d_start)
@@ -107,7 +108,7 @@
/*
* Guess order of not installed scripts in comparision
-@@ -671,7 +683,7 @@
+@@ -618,7 +630,7 @@
/*
* Follow the script and re-calculate the ordering.
*/
More information about the Initscripts-ng-commits
mailing list