Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at Mon Aug 22 09:57:49 CEST 2011.
-------- --- insserv/insserv.changes 2011-08-04 12:15:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2011-08-19 15:59:55.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 19 13:57:29 UTC 2011 - [email protected] + +- We should forward to systemctl when running under rpm (this is + supposed to be handled outside insserv) (from Frederic Crozat) +- When insserv is called with full path of initscript + ("insserv /etc/init.d/acpid") , systemctl was called with a "null" + alternative root (from Frederic Crozat). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.P611ty/_old 2011-08-22 09:56:54.000000000 +0200 +++ /var/tmp/diff_new_pack.P611ty/_new 2011-08-22 09:56:54.000000000 +0200 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 28 +Release: 30 Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.bz2 ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.P611ty/_old 2011-08-22 09:56:54.000000000 +0200 +++ /var/tmp/diff_new_pack.P611ty/_new 2011-08-22 09:56:54.000000000 +0200 @@ -1,5 +1,5 @@ --- insserv.c -+++ insserv.c 2011-08-02 12:15:27.879924899 +0000 ++++ insserv.c 2011-08-19 13:54:47.816426078 +0000 @@ -26,6 +26,7 @@ #define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, * .depend.start, .depend.halt, and .depend.stop */ @@ -262,7 +262,7 @@ + if (is_overridden_by_systemd (name)) { + char *p; + int err = 0; -+ if (alternative_root) ++ if (alternative_root && root) + asprintf (&p, "/bin/systemctl --root %s %s %s.service", root, verb, name); + else + asprintf (&p, "/bin/systemctl %s %s.service", verb, name); @@ -343,17 +343,20 @@ case '?': err: error("For help use: %s -h\n", myname); -@@ -2566,6 +2708,9 @@ int main (int argc, char *argv[]) +@@ -2566,6 +2708,12 @@ int main (int argc, char *argv[]) printf("Overwrite argument for %s is %s\n", argv[c], argr[c]); #endif /* DEBUG */ -+ for (c = 0; c < argc; c++) ++#ifdef SUSE ++ if (!underrpm()) ++#endif ++ for (c = 0; c < argc; c++) + forward_to_systemd (argv[c], del ? "disable": "enable", path != ipath); + /* * Scan and set our configuration for virtual services. */ -@@ -2612,7 +2757,7 @@ int main (int argc, char *argv[]) +@@ -2612,7 +2760,7 @@ int main (int argc, char *argv[]) * Scan scripts found in the command line to be able to resolve * all dependcies given within those scripts. */ @@ -362,7 +365,7 @@ const char *const name = argv[c]; service_t * first = (service_t*)0; char * provides, * begin, * token; -@@ -3000,8 +3145,10 @@ int main (int argc, char *argv[]) +@@ -3000,8 +3148,10 @@ int main (int argc, char *argv[]) if (!del || (del && !isarg)) warn("script %s: service %s already provided!\n", d->d_name, token); @@ -375,7 +378,7 @@ if (!del || (del && !ignore && !isarg)) continue; -@@ -3064,9 +3211,9 @@ int main (int argc, char *argv[]) +@@ -3064,9 +3214,9 @@ int main (int argc, char *argv[]) if (del) ok = chkdependencies(service); else @@ -387,7 +390,7 @@ } if (script_inf.default_start && script_inf.default_start != empty) { -@@ -3357,6 +3504,123 @@ int main (int argc, char *argv[]) +@@ -3357,6 +3507,123 @@ int main (int argc, char *argv[]) active_script(); /* @@ -511,7 +514,7 @@ * Sorry but we support only [KS][0-9][0-9]<name> */ if (maxstart > MAX_DEEP || maxstop > MAX_DEEP) -@@ -3435,13 +3699,16 @@ int main (int argc, char *argv[]) +@@ -3435,13 +3702,16 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', lvl))) { @@ -529,7 +532,7 @@ slink = false; if ((serv->start->lvl & lvl) == 0) goto stop; -@@ -3616,7 +3883,7 @@ int main (int argc, char *argv[]) +@@ -3616,7 +3886,7 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', seek))) { @@ -538,7 +541,7 @@ boolean found; char * clink; char mode; -@@ -3624,6 +3891,9 @@ int main (int argc, char *argv[]) +@@ -3624,6 +3894,9 @@ int main (int argc, char *argv[]) if (*script == '$') /* Do not link in virtual dependencies */ continue; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
