Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at Mon Mar 9 22:58:57 CET 2009. -------- --- insserv/insserv.changes 2009-02-23 13:10:42.000000000 +0100 +++ insserv/insserv.changes 2009-03-09 13:13:29.660001008 +0100 @@ -1,0 +2,5 @@ +Mon Mar 9 13:12:17 CET 2009 - werner@suse.de + +- Add service in .depend.start even if $all only is used (bnc#481182) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.O25000/_old 2009-03-09 22:54:25.000000000 +0100 +++ /var/tmp/diff_new_pack.O25000/_new 2009-03-09 22:54:25.000000000 +0100 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.12.0 -Release: 26 +Release: 27 Summary: A Program to Arrange Initialization Scripts Source0: insserv-%{version}.tar.bz2 Source1: insserv.conf @@ -67,6 +67,8 @@ %dir %{_datadir}/insserv/overrides %changelog +* Mon Mar 09 2009 werner@suse.de +- Add service in .depend.start even if $all only is used (bnc#481182) * Mon Feb 23 2009 werner@suse.de - Allow overriding level on the command line (bnc#470654) * Thu Feb 12 2009 werner@suse.de ++++++ insserv-1.12.0.dif ++++++ --- /var/tmp/diff_new_pack.O25000/_old 2009-03-09 22:54:25.000000000 +0100 +++ /var/tmp/diff_new_pack.O25000/_new 2009-03-09 22:54:25.000000000 +0100 @@ -53,7 +53,7 @@ .SH EXIT CODES The exit codes have the following conditions: --- insserv.c -+++ insserv.c 2009-02-23 13:22:46.528201409 +0100 ++++ insserv.c 2009-03-09 13:11:58.088001570 +0100 @@ -38,6 +38,9 @@ # include <rpm/rpmlib.h> # include <rpm/rpmmacro.h> @@ -73,7 +73,28 @@ if (strcasecmp(token, "$all") == 0) { serv->attr.flags |= SERV_ALL; break; -@@ -1696,6 +1701,11 @@ static void scan_script_locations(const +@@ -771,9 +776,6 @@ static inline void makedep(void) + continue; + #endif /* not MINIMAL_RULES */ + +- if (list_empty(&serv->sort.req)) +- continue; +- + if (serv->start->lvl & LVL_BOOT) + out = boot; + else +@@ -815,6 +817,10 @@ static inline void makedep(void) + fprintf(out, " %s", name); + } + } else { ++ ++ if (list_empty(&serv->sort.req)) ++ continue; ++ + np_list_for_each(pos, &serv->sort.req) { + req_t * req = getreq(pos); + service_t * dep = req->serv; +@@ -1696,6 +1702,11 @@ static void scan_script_locations(const } lsb = scan_script_defaults(dfd, d->d_name, override_path, &name, true, ignore); @@ -85,7 +106,7 @@ if (!script_inf.provides || script_inf.provides == empty) script_inf.provides = xstrdup(ptr); -@@ -2114,6 +2124,7 @@ static inline char * scan_for(DIR *const +@@ -2114,6 +2125,7 @@ static inline char * scan_for(DIR *const static inline boolean underrpm(void) { boolean ret = false; @@ -93,7 +114,7 @@ const pid_t pp = getppid(); char buf[PATH_MAX], *argv[3], *ptr; # if defined(USE_RPMLIB) && (USE_RPMLIB > 0) -@@ -2123,8 +2134,15 @@ static inline boolean underrpm(void) +@@ -2123,8 +2135,15 @@ static inline boolean underrpm(void) ssize_t len; snprintf(buf, sizeof(buf)-1, "/proc/%lu/cmdline", (unsigned long)pp); @@ -111,7 +132,7 @@ memset(buf, '\0', sizeof(buf)); if ((len = read(fd , buf, sizeof(buf)-1)) < 0) -@@ -2185,6 +2203,8 @@ static inline boolean underrpm(void) +@@ -2185,6 +2204,8 @@ static inline boolean underrpm(void) out: if (fd >= 0) close(fd); @@ -120,7 +141,7 @@ return ret; } -@@ -2238,6 +2258,7 @@ int main (int argc, char *argv[]) +@@ -2238,6 +2259,7 @@ int main (int argc, char *argv[]) boolean del = false; boolean defaults = false; boolean ignore = false; @@ -128,7 +149,7 @@ myname = basename(*argv); -@@ -2305,7 +2326,9 @@ int main (int argc, char *argv[]) +@@ -2305,7 +2327,9 @@ int main (int argc, char *argv[]) argv += optind; argc -= optind; @@ -139,7 +160,7 @@ error("usage: %s [[-r] init_script|init_directory]\n", myname); if (*argv) { -@@ -2357,7 +2380,19 @@ int main (int argc, char *argv[]) +@@ -2357,7 +2381,19 @@ int main (int argc, char *argv[]) if (strcmp(path, INITDIR) != 0) { char * tmp; @@ -160,7 +181,7 @@ if ((tmp = strstr(root, INITDIR))) { *tmp = '\0'; } else { -@@ -2490,17 +2525,45 @@ int main (int argc, char *argv[]) +@@ -2490,17 +2526,45 @@ int main (int argc, char *argv[]) /* * Scan now all scripts found in the init.d/ directory */ @@ -208,7 +229,7 @@ if (*d->d_name == '.') continue; errno = 0; -@@ -2985,16 +3048,17 @@ int main (int argc, char *argv[]) +@@ -2985,16 +3049,17 @@ int main (int argc, char *argv[]) char * ptr = argr[curr_argc]; struct _mark { const char * wrd; @@ -231,7 +252,7 @@ }; for (c = 0; mark[c].wrd; c++) { -@@ -3016,6 +3080,14 @@ int main (int argc, char *argv[]) +@@ -3016,6 +3081,14 @@ int main (int argc, char *argv[]) char * ptr = mark[c].order + len - 1; if (*ptr == ',') *ptr = '\0'; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org