Hello community, here is the log from the commit of package insserv checked in at Mon Nov 20 13:55:42 CET 2006. -------- --- insserv/insserv.changes 2006-05-27 19:17:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2006-11-20 12:03:27.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 20 11:42:40 CET 2006 - werner@suse.de + +- Expand aliases even for services which requires $all (#216202) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.iDnff5/_old 2006-11-20 13:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.iDnff5/_new 2006-11-20 13:55:30.000000000 +0100 @@ -11,12 +11,12 @@ # norootforbuild Name: insserv -License: GPL +License: GNU General Public License (GPL) Group: System/Base Provides: aaa_base:/sbin/insserv Autoreqprov: on Version: 1.04.0 -Release: 21 +Release: 40 Summary: A Program to Arrange Initialization Scripts Source: insserv-%{version}.tar.bz2 Patch: insserv-%{version}.dif @@ -52,6 +52,8 @@ %{_mandir}/man8/insserv.8.gz %changelog -n insserv +* Mon Nov 20 2006 - werner@suse.de +- Expand aliases even for services which requires $all (#216202) * Sat May 27 2006 - schwab@suse.de - Don't strip binaries. * Mon May 15 2006 - werner@suse.de ++++++ insserv-1.04.0.dif ++++++ --- /var/tmp/diff_new_pack.iDnff5/_old 2006-11-20 13:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.iDnff5/_new 2006-11-20 13:55:30.000000000 +0100 @@ -1,6 +1,6 @@ --- Makefile -+++ Makefile -@@ -39,7 +39,7 @@ ++++ Makefile 2006-11-20 00:00:00.000000000 +0100 +@@ -39,7 +39,7 @@ endif RM = rm -f MKDIR = mkdir -p RMDIR = rm -rf @@ -10,8 +10,8 @@ INSTSRPFLAGS = -m 0700 INSTSRP = install $(INSTSRPFLAGS) --- insserv.8 -+++ insserv.8 -@@ -145,6 +145,17 @@ ++++ insserv.8 2006-04-03 14:18:20.000000000 +0200 +@@ -145,6 +145,17 @@ is the only know keyword for marking a s as an interactive one, e.g. a service which requires a passphrase or password input during boot or runlevel change. @@ -29,7 +29,7 @@ .\" .SH OPTIONS Currently there are only four options for -@@ -240,6 +251,8 @@ +@@ -240,6 +251,8 @@ boot script file names will be not accep *.ba* *.old *.new @@ -39,8 +39,8 @@ *.swp *.core --- insserv.c -+++ insserv.c -@@ -460,7 +460,7 @@ ++++ insserv.c 2006-11-20 11:46:51.000000000 +0100 +@@ -460,7 +460,7 @@ static inline void nonlsb_script(void) continue; if (!(getserv(pos)->lvls & getserv(tmp)->lvls)) continue; @@ -49,7 +49,7 @@ continue; if (max < getserv(tmp)->order) { max = getserv(tmp)->order; -@@ -470,57 +470,81 @@ +@@ -470,63 +470,87 @@ static inline void nonlsb_script(void) if (req) requiresv(getserv(pos)->name, getserv(req)->name); @@ -163,7 +163,34 @@ } } } -@@ -1032,7 +1056,35 @@ + + /* +- * Alt last but not least the `$all' scripts will be set to the of ++ * Last but not least the `$all' scripts will be set to the of + * current the start order. + */ + +@@ -537,6 +561,7 @@ static inline void all_script(void) + list_for_each(pos, serv_start) { + serv_t * serv = getserv(pos); + list_t * tmp; ++ const char *name; + int neworder; + + if (!(serv->opts & SERV_ALL)) +@@ -563,7 +588,10 @@ static inline void all_script(void) + neworder = maxorder; + else if (neworder > maxorder) + maxorder = neworder; +- setorder(serv->name, neworder, false); ++ /* Expand aliases to the real script name */ ++ if ((name = getscript(serv->name)) == NULL) ++ name = serv->name; ++ setorder(name, neworder, false); + } + } + +@@ -1032,7 +1060,35 @@ static boolean scan_script_defaults(cons #undef COMMON_SHD_ARGS fclose(script); @@ -200,7 +227,7 @@ #undef provides #undef required_start -@@ -1106,7 +1158,7 @@ +@@ -1106,7 +1162,7 @@ static const int map_runlevel_to_seek(co /* * Scan current service structure */ @@ -209,7 +236,7 @@ { int runlevel; -@@ -1315,6 +1367,8 @@ +@@ -1315,6 +1371,8 @@ static int cfgfile_filter(const struct d !strncmp(end, "ba", 2) || /* .bak, .backup, ... */ !strcmp(end, "old") || !strcmp(end, "new") || @@ -218,7 +245,7 @@ !strcmp(end, "save") || !strcmp(end, "swp") || /* Used by vi like editors */ !strcmp(end, "core")) /* modern core dump */ -@@ -1571,6 +1625,9 @@ +@@ -1571,6 +1629,9 @@ int main (int argc, char *argv[]) * Scan always for the runlevel links to see the current * link scheme of the services. */ @@ -229,16 +256,16 @@ if ((initdir = opendir(path)) == NULL) --- insserv.conf -+++ insserv.conf -@@ -43,4 +43,4 @@ ++++ insserv.conf 2006-05-15 12:44:50.000000000 +0200 +@@ -43,4 +43,4 @@ $time boot.clock +xntpd # # Services which need to be interactive # -<interactive> boot.crypto boot.localfs boot.rootfsck apache apache2 +<interactive> boot.crypto boot.localfs boot.rootfsck apache apache2 kdump --- listing.c -+++ listing.c -@@ -45,7 +45,8 @@ ++++ listing.c 2006-04-03 14:18:20.000000000 +0200 +@@ -45,7 +45,8 @@ typedef struct dir_struct { list_t d_list; /* The linked list to other directories */ list_t link; /* symbolic links in this directory */ unsigned int flags; @@ -248,7 +275,7 @@ char * name; char * script; unsigned int lvl; -@@ -79,6 +80,7 @@ +@@ -79,6 +80,7 @@ static dir_t * providedir(const char * n ptr = d_start->prev; this->name = xstrdup(name); this->script = NULL; @@ -256,7 +283,7 @@ this->order = 0; this->flags = 0; this->lvl = 0; -@@ -118,13 +120,13 @@ +@@ -118,13 +120,13 @@ static dir_t * findscript(const char * s } /* @@ -274,7 +301,7 @@ list_t * l_start = &(dir->link); list_t * dent; link_t * this; -@@ -134,7 +136,7 @@ +@@ -134,7 +136,7 @@ static void ln_sf(const char * isprovide list_for_each(dent, l_start) { dir_t * target = getlink(dent)->target; @@ -283,7 +310,7 @@ goto out; } -@@ -170,6 +172,11 @@ +@@ -170,6 +172,11 @@ out: * links within a service dir. * Just like a `find * -follow' within a directory tree * of depth one with cross linked dependencies. @@ -295,7 +322,7 @@ */ #if defined(DEBUG) && (DEBUG > 0) # define loop_warn_two(a,b) \ -@@ -206,6 +213,9 @@ +@@ -206,6 +213,9 @@ static void __follow (dir_t * dir, dir_t return; } @@ -305,7 +332,7 @@ if (deep > MAX_DEEP) { if (!warned) warn("Max recursions depth %d reached\n", MAX_DEEP); -@@ -240,14 +250,24 @@ +@@ -240,14 +250,24 @@ static void __follow (dir_t * dir, dir_t /* * As higher the link depth, as higher the start order. */ @@ -333,7 +360,7 @@ tmp->flags |= DIR_SCAN; /* Mark this service for loop detection */ -@@ -273,7 +293,7 @@ +@@ -273,7 +293,7 @@ static void __follow (dir_t * dir, dir_t break; /* Loop detected, stop recursion */ } @@ -342,7 +369,7 @@ /* Just for the case an inner recursion was stopped */ if (loop_check(target) || loop_check(tmp) || loop_check(skip)) { -@@ -299,7 +319,7 @@ +@@ -299,7 +319,7 @@ static void __follow (dir_t * dir, dir_t inline static void follow(dir_t * dir) { /* Link depth starts here with one */ @@ -351,7 +378,7 @@ } /* -@@ -617,18 +637,21 @@ +@@ -617,18 +637,21 @@ void setorder(const char * script, const if (!dir) goto out; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org