Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at 2012-09-25 10:24:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/insserv (Old) and /work/SRC/openSUSE:Factory/.insserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "insserv", Maintainer is "wer...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/insserv/insserv.changes 2011-11-21 12:34:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.insserv.new/insserv.changes 2012-09-25 10:24:05.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 24 14:05:44 UTC 2012 - wer...@suse.de + +- Avoid warnings if there exsists LSB tags for a script in the + override locations (fate #314069) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.zEI5zl/_old 2012-09-25 10:24:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zEI5zl/_new 2012-09-25 10:24:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package insserv # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: insserv -License: GPL-2.0+ -Group: System/Base Provides: aaa_base:/sbin/insserv -AutoReqProv: on Version: 1.14.0 -Release: 30 +Release: 0 Summary: A Program to Arrange Initialization Scripts +License: GPL-2.0+ +Group: System/Base Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.bz2 Source1: insserv.conf ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.zEI5zl/_old 2012-09-25 10:24:08.000000000 +0200 +++ /var/tmp/diff_new_pack.zEI5zl/_new 2012-09-25 10:24:08.000000000 +0200 @@ -1,5 +1,5 @@ --- insserv.c -+++ insserv.c 2011-11-09 11:39:29.223646323 +0000 ++++ insserv.c 2012-09-24 14:05:15.071006364 +0000 @@ -26,6 +26,7 @@ #define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, * .depend.start, .depend.halt, and .depend.stop */ @@ -244,7 +244,72 @@ if (!provides) warn("missing `Provides:' entry: please add.\n"); if (provides == empty) -@@ -2336,19 +2426,80 @@ out: +@@ -1588,27 +1678,39 @@ static uchar scan_script_defaults(int df + } + #endif /* SUSE */ + +- /* Replace with headers from the script itself */ +- ret |= scan_lsb_headers(dfd, path, cache, ignore); +- +- /* Do not override the upstarts defaults, if we allow this +- * we have to change name to the link name otherwise the +- * name is always "upstart-job" */ +- if (ret & FOUND_LSB_UPSTART) +- goto out; ++ if (is_upstart_job(path) != (char*)0) { ++ /* ++ * Do not override the upstarts defaults, if we allow this ++ * we have to change name to the link name otherwise the ++ * name is always "upstart-job" ++ */ ++ ret |= scan_lsb_headers(dfd, path, cache, ignore); + +- /* Load values if the override file exist */ +- if ((ret & FOUND_LSB_HEADER) == 0) +- ret |= load_overrides("/usr/share/insserv/overrides", name, cache, ignore); +- else +- ret |= FOUND_LSB_DEFAULT; ++ if (ret & FOUND_LSB_UPSTART) ++ goto out; ++ } + + /* + * Allow host-specific overrides to replace the content in the + * init.d scripts + */ + ret |= load_overrides(override_path, name, cache, ignore); ++ if (ret & FOUND_LSB_OVERRIDE) ++ goto out; ++ ++ /* ++ * Load third-party-specific values if the override file exist ++ */ ++ ret |= load_overrides("/usr/share/insserv/overrides", name, cache, ignore); ++ if (ret & FOUND_LSB_OVERRIDE) ++ goto out; ++ ++ /* ++ * Replace with headers from the script itself ++ */ ++ ret |= scan_lsb_headers(dfd, path, cache, ignore); + out: ++ ret |= FOUND_LSB_DEFAULT; + free(name); + return ret; + } +@@ -1870,9 +1972,9 @@ static void scan_script_locations(const + + if ((lsb & FOUND_LSB_HEADER) == 0) { + if ((lsb & (FOUND_LSB_DEFAULT|FOUND_LSB_OVERRIDE)) == 0) +- warn("warning: script '%s' missing LSB tags and overrides\n", d->d_name); ++ warn("warning: script '%s' missing LSB tags and overrides\n", d->d_name); + else +- warn("warning: script '%s' missing LSB tags\n", d->d_name); ++ warn("warning: script '%s' missing LSB tags\n", d->d_name); + } + + if (script_inf.required_start && script_inf.required_start != empty) { +@@ -2336,19 +2438,80 @@ out: } #endif /* SUSE */ @@ -284,15 +349,15 @@ + int err = 0; + + if (alternative_root && root) -+ err = asprintf (&p, "/bin/systemctl --no-reload --root %s %s %s.service", root, verb, name); ++ err = asprintf (&p, "/bin/systemctl --quiet --no-reload --root %s %s %s.service", root, verb, name); + else { + struct statfs stfs; + if (statfs("/sys/fs/cgroup/systemd", &stfs) < 0 && errno != ENOENT) + error("statfs(): %s\n", strerror(errno)); + if (errno == 0 && stfs.f_type == CGROUP_SUPER_MAGIC) -+ err = asprintf (&p, "/bin/systemctl %s %s.service", verb, name); ++ err = asprintf (&p, "/bin/systemctl --quiet %s %s.service", verb, name); + else -+ err = asprintf (&p, "/bin/systemctl --no-reload %s %s.service", verb, name); ++ err = asprintf (&p, "/bin/systemctl --quiet --no-reload %s %s.service", verb, name); + } + if (err < 0) + error("asprintf(): %s\n", strerror(errno)); @@ -336,7 +401,7 @@ }; static void help(const char *restrict const name) attribute((nonnull(1))); -@@ -2364,6 +2515,8 @@ static void help(const char *restrict co +@@ -2364,6 +2527,8 @@ static void help(const char *restrict co printf(" -o <path>, --override <path> Path to replace " OVERRIDEDIR ".\n"); printf(" -c <config>, --config <config> Path to config file.\n"); printf(" -n, --dryrun Do not change the system, only talk about it.\n"); @@ -345,7 +410,7 @@ printf(" -d, --default Use default runlevels a defined in the scripts\n"); } -@@ -2386,6 +2539,8 @@ int main (int argc, char *argv[]) +@@ -2386,6 +2551,8 @@ int main (int argc, char *argv[]) boolean defaults = false; boolean ignore = false; boolean loadarg = false; @@ -354,7 +419,7 @@ myname = basename(*argv); -@@ -2400,7 +2555,7 @@ int main (int argc, char *argv[]) +@@ -2400,7 +2567,7 @@ int main (int argc, char *argv[]) for (c = 0; c < argc; c++) argr[c] = (char*)0; @@ -363,7 +428,7 @@ size_t l; switch (c) { case 'c': -@@ -2445,6 +2600,9 @@ int main (int argc, char *argv[]) +@@ -2445,6 +2612,9 @@ int main (int argc, char *argv[]) goto err; upstartjob_path = optarg; break; @@ -373,7 +438,7 @@ case '?': err: error("For help use: %s -h\n", myname); -@@ -2566,6 +2724,12 @@ int main (int argc, char *argv[]) +@@ -2566,6 +2736,12 @@ int main (int argc, char *argv[]) printf("Overwrite argument for %s is %s\n", argv[c], argr[c]); #endif /* DEBUG */ @@ -386,7 +451,7 @@ /* * Scan and set our configuration for virtual services. */ -@@ -2612,7 +2776,7 @@ int main (int argc, char *argv[]) +@@ -2612,7 +2788,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. */ @@ -395,7 +460,7 @@ const char *const name = argv[c]; service_t * first = (service_t*)0; char * provides, * begin, * token; -@@ -3000,8 +3164,10 @@ int main (int argc, char *argv[]) +@@ -3000,8 +3176,10 @@ int main (int argc, char *argv[]) if (!del || (del && !isarg)) warn("script %s: service %s already provided!\n", d->d_name, token); @@ -408,7 +473,7 @@ if (!del || (del && !ignore && !isarg)) continue; -@@ -3064,9 +3230,9 @@ int main (int argc, char *argv[]) +@@ -3064,9 +3242,9 @@ int main (int argc, char *argv[]) if (del) ok = chkdependencies(service); else @@ -420,7 +485,7 @@ } if (script_inf.default_start && script_inf.default_start != empty) { -@@ -3357,6 +3523,123 @@ int main (int argc, char *argv[]) +@@ -3357,6 +3535,123 @@ int main (int argc, char *argv[]) active_script(); /* @@ -544,7 +609,7 @@ * Sorry but we support only [KS][0-9][0-9]<name> */ if (maxstart > MAX_DEEP || maxstop > MAX_DEEP) -@@ -3435,13 +3718,16 @@ int main (int argc, char *argv[]) +@@ -3435,13 +3730,16 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', lvl))) { @@ -562,7 +627,7 @@ slink = false; if ((serv->start->lvl & lvl) == 0) goto stop; -@@ -3616,7 +3902,7 @@ int main (int argc, char *argv[]) +@@ -3616,7 +3914,7 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', seek))) { @@ -571,7 +636,7 @@ boolean found; char * clink; char mode; -@@ -3624,6 +3910,9 @@ int main (int argc, char *argv[]) +@@ -3624,6 +3922,9 @@ int main (int argc, char *argv[]) if (*script == '$') /* Do not link in virtual dependencies */ continue; @@ -582,7 +647,7 @@ if (serv->stopp->lvl & lvl) { # ifndef USE_KILL_IN_BOOT --- listing.c -+++ listing.c 2010-11-26 14:16:31.675926125 +0000 ++++ listing.c 2012-09-24 12:50:06.132964038 +0000 @@ -534,19 +534,16 @@ out: * Sort linked list of provides into start or stop order * during this set new start or stop order of the serives. @@ -732,6 +797,24 @@ } /* +@@ -912,7 +961,7 @@ void show_all() + else + script = "%guessed"; + lvlstr = lvl2str(lvl); +- info("K%.2d %s 0x%.2x '%s' (%s)\n", deep, name, lvl, lvlstr, script); ++ info(1, "K%.2d %s 0x%.2x '%s' (%s)\n", deep, name, lvl, lvlstr, script); + xreset(lvlstr); + } + if (maxstart > 0) list_for_each(tmp, d_start) { +@@ -934,7 +983,7 @@ void show_all() + else + script = "%guessed"; + lvlstr = lvl2str(lvl); +- info("S%.2d %s 0x%.2x '%s' (%s)\n", deep, name, lvl, lvlstr, script); ++ info(1, "S%.2d %s 0x%.2x '%s' (%s)\n", deep, name, lvl, lvlstr, script); + xreset(lvlstr); + } + } --- listing.h +++ listing.h 2011-02-07 12:23:03.970855430 +0000 @@ -64,8 +64,7 @@ typedef unsigned int uint; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
