File insserv-1.12.0.dif of Package insserv

Overview Repositories Revisions Requests Users Attributes Meta

File insserv-1.12.0.dif of Package insserv (Revision a8952b32b77436be70c48445834b4e55)

Currently displaying revision a8952b32b77436be70c48445834b4e55 , Show latest

--- insserv.8.in
+++ insserv.8.in	2009-06-29 14:21:17.377902650 +0200
@@ -76,6 +76,7 @@ by reading the comment header of the scr
  # X-Stop-After:      boot_facility_1 [ boot_facility_2 ...]
  # Default-Start:     run_level_1 [ run_level_2 ...]
  # Default-Stop:      run_level_1 [ run_level_2 ...]
+ # X-Interactive:     true
  # Short-Description: single_line_description
  # Description:       multiline_description
  ### END INIT INFO
@@ -117,6 +118,11 @@ which are declared by these two Stop tag
 these tags is stopped.
 @@END_SUSE@@
 .PP
+The optional X\-Interactive keyword implies that the script using this
+keyword should be started alone in a concurrent boot configuration
+because it interact with the user at the console.  Only the value
+`true' is recogniced.  All other are ignored.
+.PP
 The optional
 .B X\-Start\-Before
 keyword implies that the script using this keyword
@@ -195,7 +201,7 @@ Here is an example for
  # System logger is operational
  $syslog         syslog
 
- # All network daemons are running
+ # All network daemons are running (This was removed in LSB 1.2)
  $netdaemons     portmap inetd
 
  # Services which need to be interactive
@@ -215,7 +221,19 @@ are keywords.  Currently
 is the only know keyword for marking a service
 as an interactive one, e.g. a service which requires
 a passphrase or password input during boot
-or runlevel change.
+or runlevel change.  The special facility
+.B $null
+is used to enforce an empty dependency in case of
+.B Should-Stop
+and
+@@BEGIN_SUSE@@
+.B Required-Stop
+otherwise insserv assumes the same dependencies as for the
+.B Start
+case.
+@@ELSE_SUSE@@
+.BR Required-Stop .
+@@END_SUSE@@
 .P
 Beside the defined
 .B System Facilities
@@ -258,7 +276,9 @@ Use default runlevels a defined in the s
 This may restore an edited runlevel link scheme.
 .TP
 .BR \-f ,\  \-\-force
-Ignore if a required service is missed.
+Ignore if a required service is missed. Beside this if start and or
+stop levels are specified on the command line the default levels of
+the script will be ignored.
 .TP
 .BR \-h ,\  \-\-help
 Print out short usage message.
@@ -332,6 +352,10 @@ or simple provide a missing LSB comment
 by placing a file with the new LSB comment header using the same
 name as the boot or init script in the directory
 .IR /etc/insserv/overrides/ .
+For third party boot scripts without LSB header it is possible to
+add a file with the same name in the directory
+.I /usr/share/insserv/overrides/
+to make them completely LSB compliant.
 .\"
 .SH EXIT CODES
 The exit codes have the following conditions:
--- insserv.c
+++ insserv.c	2009-08-18 11:37:06.334401679 +0200
@@ -38,6 +38,9 @@
 # include <rpm/rpmlib.h>
 # include <rpm/rpmmacro.h>
 #endif /* USE_RPMLIB */
+#ifdef SUSE
+# include <sys/mount.h>
+#endif /* SUSE */
 #include "listing.h"
 
 #ifdef SUSE
@@ -97,6 +100,7 @@ static inline void oneway(char *restrict
 #define DEFAULT_START	DEFAULT  START VALUE
 #define DEFAULT_STOP	DEFAULT  STOP  VALUE
 #define DESCRIPTION	COMM "description" VALUE
+#define INTERACTIVE	COMM "(x[-_]+[a-z0-9_-]*)?interactive" VALUE
 
 /* System facility search within /etc/insserv.conf */
 #define EQSIGN		"([[:blank:]]*[=:][[:blank:]]*|[[:blank:]]+)"
@@ -133,6 +137,7 @@ typedef struct lsb_struct {
     char *default_start;
     char *default_stop;
     char *description;
+    char *interactive;
 } attribute((aligned(sizeof(char*)))) lsb_t;
 
 /* Search results points here */
@@ -147,6 +152,7 @@ typedef struct reg_struct {
     regex_t def_start;
     regex_t def_stop;
     regex_t desc;
+    regex_t interact;
 } attribute((aligned(sizeof(regex_t)))) reg_t;
 
 typedef struct creg_struct {
@@ -217,6 +223,7 @@ typedef struct string {
 typedef struct repl {
     list_t     r_list;
     string_t	 r[1];
+    ushort	flags;
 } __align repl_t;
 #define getrepl(arg)	list_entry((arg), struct repl, r_list)
 
@@ -290,6 +297,8 @@ static void rememberreq(service_t * rest
 	    requires(here, need, type);
 	    break;
 	case '$':
+	    if (strcasecmp(token, "$null") == 0)
+		break;
 	    if (strcasecmp(token, "$all") == 0) {
 		serv->attr.flags |= SERV_ALL;
 		break;
@@ -771,9 +780,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 +821,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;
@@ -1132,6 +1142,7 @@ static inline void scan_script_regalloc(
     regcompiler(&reg.def_start, DEFAULT_START,  REG_EXTENDED|REG_ICASE|REG_NEWLINE);
     regcompiler(&reg.def_stop,  DEFAULT_STOP,   REG_EXTENDED|REG_ICASE|REG_NEWLINE);
     regcompiler(&reg.desc,      DESCRIPTION,    REG_EXTENDED|REG_ICASE|REG_NEWLINE);
+    regcompiler(&reg.interact,  INTERACTIVE,    REG_EXTENDED|REG_ICASE|REG_NEWLINE);
 }
 
 static inline void scan_script_reset(void) attribute((always_inline));
@@ -1147,6 +1158,7 @@ static inline void scan_script_reset(voi
     xreset(script_inf.default_start);
     xreset(script_inf.default_stop);
     xreset(script_inf.description);
+    xreset(script_inf.interactive);
 }
 
 #define FOUND_LSB_HEADER   0x01
@@ -1177,6 +1189,7 @@ static uchar scan_lsb_headers(const int
 #define default_start	script_inf.default_start
 #define default_stop	script_inf.default_stop
 #define description	script_inf.description
+#define interactive	script_inf.interactive
 
     info("Loading %s\n", path);
 
@@ -1273,6 +1286,14 @@ static uchar scan_lsb_headers(const int
 		description = empty;
 	}
 
+	if (!interactive    && regexecutor(&reg.interact,      COMMON_ARGS) == true) {
+	    if (val->rm_so < val->rm_eo) {
+		*(pbuf+val->rm_eo) = '\0';
+		interactive = xstrdup(pbuf+val->rm_so);
+	    } else
+		interactive = empty;
+	}
+
 	/* Skip scanning below from LSB magic end */
 	if ((end = strstr(buf, "### END INIT INFO")))
 	    break;
@@ -1341,6 +1362,7 @@ static uchar scan_lsb_headers(const int
 #undef default_start
 #undef default_stop
 #undef description
+#undef interactive
     return ret;
 }
 
@@ -1503,6 +1525,7 @@ static inline void scan_script_regfree()
     regfree(&reg.def_start);
     regfree(&reg.def_stop);
     regfree(&reg.desc);
+    regfree(&reg.interact);
 }
 
 static struct {
@@ -1696,6 +1719,11 @@ static void scan_script_locations(const
 	    }
 
 	    lsb = scan_script_defaults(dfd, d->d_name, override_path, &name, true, ignore);
+	    if (!name) {
+		warn("warning: script is corrupt or invalid: %s/%s%s\n", path, rcd, d->d_name);
+		continue;
+	    }
+
 	    if (!script_inf.provides || script_inf.provides == empty)
 		script_inf.provides = xstrdup(ptr);
 
@@ -1776,6 +1804,9 @@ static void scan_script_locations(const
 		if (script_inf.stop_after && script_inf.stop_after != empty) {
 		    reversereq(service, REQ_SHLD|REQ_KILL, script_inf.stop_after);
 		}
+		if (script_inf.interactive && 0 == strcmp(script_inf.interactive, "true")) {
+		    service->attr.flags |= SERV_INTRACT;
+		}
 	    }
 
 	    if (name) 
@@ -1849,6 +1880,7 @@ static void scan_conf_file(const char *r
 				if (posix_memalign((void*)&subst, sizeof(void*), alignof(repl_t)) != 0)
 				    error("%s", strerror(errno));
 				insert(&subst->r_list, r_list->prev);
+				subst->flags = 0;
 				r = &subst->r[0];
 				if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
 				    error("%s", strerror(errno));
@@ -1878,6 +1910,7 @@ static void scan_conf_file(const char *r
 				error("%s", strerror(errno));
 			    insert(&subst->r_list, r_list->prev);
 			    r = &subst->r[0];
+			    subst->flags = 0;
 			    if (posix_memalign((void*)&r->ref, sizeof(void*), alignof(typeof(r->ref))+strsize(token)) != 0)
 				error("%s", strerror(errno));
 			    *r->ref = 1;
@@ -2028,33 +2061,32 @@ static void expand_faci(list_t *restrict
 	    goto out;
 	}
 
-	if ((*deep)++ > 10) {
-	    warn("The nested level of the system facilities in the insserv.conf file(s) is to large\n");
-	    goto out;
-	}
-
 	list_for_each_safe(tmp, safe, ptr) {
 	    repl_t * rnxt = getrepl(tmp);
+	    if (rnxt->flags & 0x0001) {
+		error("Loop detected during expanding system facilities in the insserv.conf file(s): %s\n",
+		      rnxt->r[0].name);
+	    }
 	    if (*rnxt->r[0].name == '$') {
-		expand_faci(tmp, head, deep);
-	    } else {
-		if (*deep == 1) {
-		    if (--(*rent->r[0].ref) <= 0)
-			free(rent->r[0].ref);
-		    rent->r[0] = rnxt->r[0];
-		    ++(*rent->r[0].ref);
-		} else {
-		    repl_t *restrict subst;
-		    if (posix_memalign((void*)&subst, sizeof(void*), alignof(repl_t)) != 0)
-			error("%s", strerror(errno));
-		    insert(&subst->r_list, head);
-		    subst->r[0] = rnxt->r[0];
-		    ++(*subst->r[0].ref);
+		if (*deep > 10) {
+		    warn("The nested level of the system facilities in the insserv.conf file(s) is to large\n");
+		    goto out;
 		}
+		(*deep)++;
+		rnxt->flags |= 0x0001;
+		expand_faci(tmp, head, deep);
+		rnxt->flags &= ~0x0001;
+		(*deep)--;
+	    } else if (*deep > 0) {
+		repl_t *restrict subst;
+		if (posix_memalign((void*)&subst, sizeof(void*), alignof(repl_t)) != 0)
+		    error("%s", strerror(errno));
+		insert(&subst->r_list, head->prev);
+		subst->r[0] = rnxt->r[0];
+		(*subst->r[0].ref) = 1;
 	    }
 	}
 out:
-	(*deep)--;
 	return;
 }
 
@@ -2064,9 +2096,12 @@ static inline void expand_conf(void)
     list_for_each(ptr, sysfaci_start) {
 	list_t * rlist, * safe, * head = &getfaci(ptr)->replace;
 	list_for_each_safe(rlist, safe, head) {
-	    if (*getrepl(rlist)->r[0].name == '$') {
+	    repl_t * tmp = getrepl(rlist);
+	    if (*tmp->r[0].name == '$') {
 		int deep = 0;
+		tmp->flags |= 0x0001;
 		expand_faci(rlist, rlist, &deep);
+		tmp->flags &= ~0x0001;
 	    }
 	}
     }
@@ -2114,6 +2149,7 @@ static inline char * scan_for(DIR *const
 static inline boolean underrpm(void)
 {
     boolean ret = false;
+    boolean mnt = true;
     const pid_t pp = getppid();
     char buf[PATH_MAX], *argv[3], *ptr;
 # if defined(USE_RPMLIB) && (USE_RPMLIB > 0)
@@ -2123,8 +2159,15 @@ static inline boolean underrpm(void)
     ssize_t len;
 
     snprintf(buf, sizeof(buf)-1, "/proc/%lu/cmdline", (unsigned long)pp);
-    if ((fd = open(buf, O_NOCTTY|O_RDONLY)) < 0)
-	goto out;
+    do {
+	if ((fd = open(buf, O_NOCTTY|O_RDONLY)) >= 0)
+	    break;
+	if (!mnt || (errno != ENOENT))
+	    goto out;
+	if (mount("proc", "/proc", "proc", 0, NULL) < 0)
+	    error ("underrpm() can not mount /proc: %s\n", strerror(errno));
+	mnt = false;
+    } while (1);
 
     memset(buf, '\0', sizeof(buf));
     if ((len = read(fd , buf, sizeof(buf)-1)) < 0)
@@ -2185,6 +2228,8 @@ static inline boolean underrpm(void)
 out:
     if (fd >= 0)
 	close(fd);
+    if (!mnt)
+	umount("/proc");
 
     return ret;
 }
@@ -2238,6 +2283,7 @@ int main (int argc, char *argv[])
     boolean del = false;
     boolean defaults = false;
     boolean ignore = false;
+    boolean loadarg = false;
 
     myname = basename(*argv);
 
@@ -2305,7 +2351,9 @@ int main (int argc, char *argv[])
     argv += optind;
     argc -= optind;
 
-    if (!argc && del)
+    if (argc)
+	loadarg = true;
+    else if (del)
 	error("usage: %s [[-r] init_script|init_directory]\n", myname);
 
     if (*argv) {
@@ -2357,7 +2405,19 @@ int main (int argc, char *argv[])
 
     if (strcmp(path, INITDIR) != 0) {
 	char * tmp;
-	root = xstrdup(path);
+	if (*path != '/') {
+	    char * pwd = getcwd((char*)0, 0);
+	    size_t len = strlen(pwd)+1+strlen(path);
+	    root = (char*)malloc(len);
+	    if (!root)
+		error("%s", strerror(errno));
+	    strcpy(root, pwd);
+	    if (pwd[1])
+		strcat(root, "/");
+	    strcat(root, path);
+	    free(pwd);
+	} else
+	    root = xstrdup(path);
 	if ((tmp = strstr(root, INITDIR))) {
 	    *tmp = '\0';
 	} else {
@@ -2490,17 +2550,45 @@ int main (int argc, char *argv[])
     /*
      * Scan now all scripts found in the init.d/ directory
      */
-    while ((d = readdir(initdir)) != (struct dirent*)0) {
-	const boolean isarg = chkfor(d->d_name, argv, argc);
+    for (;;) {
 	service_t * service = (service_t*)0;
 	char * token;
 	char * begin = (char*)0;	/* hold start pointer of strings handled by strsep() */
 	boolean hard = false;
+	boolean isarg = false;
 	uchar lsb = 0;
 #if defined(DEBUG) && (DEBUG > 0)
 	int nobug = 0;
 #endif
 
+	if ((d = readdir(initdir)) == (struct dirent*)0) {
+	    /*
+	     * If first script in argument list was loaded in advance, then
+	     * rewind the init.d/ directory stream and attempt to load all
+	     * other scripts.
+	     */
+	    if (loadarg) {
+		loadarg = false;
+		rewinddir(initdir);
+		continue;
+	    }
+	    break;
+	}
+
+	isarg = chkfor(d->d_name, argv, argc);
+
+	/*
+	 * Load first script in argument list before all other scripts. This
+	 * avoids problems with loading scripts in underterministic sequence
+	 * returned by readdir(3).
+	 */
+	if (loadarg && !isarg)
+	    continue;
+	if (loadarg  && isarg && (curr_argc != 0))
+	    continue;
+	if (!loadarg && isarg && (curr_argc == 0))
+	    continue;
+
 	if (*d->d_name == '.')
 	    continue;
 	errno = 0;
@@ -2807,6 +2895,9 @@ int main (int argc, char *argv[])
 			if (script_inf.should_stop && script_inf.should_stop != empty) {
 			    rememberreq(service, REQ_SHLD|REQ_KILL, script_inf.should_stop);
 			}
+			if (script_inf.interactive && 0 == strcmp(script_inf.interactive, "true")) {
+			    service->attr.flags |= SERV_INTRACT;
+			}
 		    }
 
 		    if (script_inf.start_before && script_inf.start_before != empty) {
@@ -2985,16 +3076,17 @@ int main (int argc, char *argv[])
 		char * ptr = argr[curr_argc];
 		struct _mark {
 		    const char * wrd;
+		    const boolean sk;
 		    char * order;
 		    char ** str;
 		} mark[] = {
-		    {"start=",	  (char*)0, &script_inf.default_start},
-		    {"stop=",	  (char*)0, &script_inf.default_stop },
+		    {"start=",	  true,  (char*)0, &script_inf.default_start},
+		    {"stop=",	  false, (char*)0, &script_inf.default_stop },
 #if 0
-		    {"reqstart=", (char*)0, &script_inf.required_start},
-		    {"reqstop=",  (char*)0, &script_inf.required_stop },
+		    {"reqstart=", false, (char*)0, &script_inf.required_start},
+		    {"reqstop=",  false, (char*)0, &script_inf.required_stop },
 #endif
-		    {(char*)0,	  (char*)0, (char**)0}
+		    {(char*)0,	  false, (char*)0, (char**)0}
 		};
 
 		for (c = 0; mark[c].wrd; c++) {
@@ -3016,6 +3108,14 @@ int main (int argc, char *argv[])
 			    char * ptr = mark[c].order + len - 1;
 			    if (*ptr == ',') *ptr = '\0';
 			}
+			if (ignore) {
+			    service_t *arg = findservice(getprovides(d->d_name));
+			    arg = getorig(arg);
+			    if (mark[c].sk)
+				arg->start->lvl = 0;
+			    else
+				arg->stopp->lvl = 0;
+			}
 			xreset(*(mark[c].str));
 			*(mark[c].str) = xstrdup(mark[c].order);
 		    }
--- listing.c
+++ listing.c	2009-08-17 14:15:48.893900934 +0200
@@ -364,6 +364,7 @@ static void __follow (dir_t *restrict di
 	 * Do not count the dependcy deep of the system facilities
 	 * but follow them to count the replacing provides.
 	 */
+
 	if (*ptmp->name == '$')
 	    warn("System facilities not fully expanded, see %s!\n", dir->name);
 	else if (++deep > MAX_DEEP) {
@@ -398,6 +399,12 @@ static void __follow (dir_t *restrict di
 		break;				/* Loop detected, stop recursion */
 	    }
 
+	    if ((mode == 'S') && (attof(tmp)->flags & SERV_ALL)) {
+		warn("%s depends on %s and therefore on system facility `$all' which can not be true!\n",
+		     target->script ? target->script : target->name, tmp->script ? tmp->script : tmp->name);
+		continue;
+	    }
+
 	    if (ptrg->deep >= deep)		/* Nothing new */
 		continue;
 						/* The inner recursion */
--- listing.h
+++ listing.h	2009-07-02 10:48:50.789901632 +0200
@@ -92,7 +92,7 @@ static inline void prefetch(const void *
 #endif
 #define __packed attribute((packed))
 
-#define alignof(type)		(sizeof(type)+(sizeof(type)%sizeof(void*)))
+#define alignof(type)		((sizeof(type)+(sizeof(void*)-1)) & ~(sizeof(void*)-1))
 #define strsize(string)		((strlen(string)+1)*sizeof(char))
 
 typedef struct list_struct {
--- tests/suite
+++ tests/suite	2009-08-17 11:24:02.497901719 +0200
@@ -79,6 +79,22 @@ else
 	$time		hwclock
 	<interactive>	udev mountdevsubfs checkroot checkfs console-screen
 	EOF
+    update_conf ()
+    {
+	set +C
+	cat <<-'EOF' > $insconf
+	$local_fs       +mountall +umountfs
+	$network        +networking +ifupdown
+	$named          +named +dnsmasq +lwresd +bind9 $network
+	$remote_fs      $local_fs +mountnfs +mountnfs-bootclean +umountnfs +sendsigs
+	$syslog         +syslog +sysklogd
+	$portmap        portmap
+	$time           hwclock
+	<interactive>   udev mountdevsubfs checkroot checkfs console-screen
+	EOF
+	set -C
+    }
+
 fi
 chmod u+w,a+r $insconf
 
@@ -94,6 +110,12 @@ insserv_del ()
     $insserv $debug -c $insconf -p $initddir -o $overridedir -r $script
 }
 
+initdir_purge ()
+{
+    rm -rf ${initddir}/../rc*.d ${initddir}
+    mkdir -p ${initddir}
+}
+
 relpath ()
 {
     local OLDIFS IFS
@@ -201,6 +223,13 @@ addscript ()
     chmod u+w,a+rx $script
 }
 
+remscript ()
+{
+    local scriptname=$1
+    local script=${initddir}/$scriptname
+    rm -f $script
+}
+
 insertscript ()
 {
     local scriptname=$1

Places

File insserv-1.12.0.dif of Package insserv (Revision a8952b32b77436be70c48445834b4e55)

Places