version 0.41.2

The do_openrc() function was not waiting properly for the child process
which started the runlevel to return. We need to repeatedly call
waitpid() until its return value matches the pid of the child process or
the child process does not exist.

This fixes #216.
This fixes #300.

ChangeLog

@@ -1,3 +1,29 @@
+commit 238042d28b85277a4b5f19c3d13c4331b1325662
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    openrc-init: fix waitpid checks
+    
+    The do_openrc() function was not waiting properly for the child process
+    which started the runlevel to return. We need to repeatedly call
+    waitpid() until its return value matches the pid of the child process or
+    the child process does not exist.
+    
+    This fixes #216.
+    This fixes #300.
+
+commit 8d6370d4693f6f8397b808059e5fe436c8dc8993
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    version 0.41.1
+
+commit 75ce3addd2be964ce271858af08e7f750365916a
+Author: William Hubbs <w.d.hubbs@gmail.com>
+Commit: William Hubbs <w.d.hubbs@gmail.com>
+
+    update ChangeLog
+
 commit d818be6e2bc00c790f6f4aeb2670f007951b2ab3
 Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
@@ -1455,18 +1481,3 @@ Author: William Hubbs <w.d.hubbs@gmail.com>
 Commit: William Hubbs <w.d.hubbs@gmail.com>
 
     openrc-init: convert execl calls to execlp
-
-commit f383fd87b121492a04362ca9041f686d981718f1
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    kill_all: change execl call to execlp
-
-commit cfded513cd9b7febe4b7cf39a80411e4303f0655
-Author: William Hubbs <w.d.hubbs@gmail.com>
-Commit: William Hubbs <w.d.hubbs@gmail.com>
-
-    openrc-init: set a default path
-    
-    The default path provided by the system if one isn't set only includes
-    "/bin:/usr/bin". This adds the default path setting from sysvinit.

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.41.1
+VERSION=	0.41.2
 PKG=		${NAME}-${VERSION}

src/rc/openrc-init.c

@@ -43,40 +43,45 @@
 static const char *path_default = "/sbin:/usr/sbin:/bin:/usr/bin";
 static const char *rc_default_runlevel = "default";
 
-static pid_t do_openrc(const char *runlevel)
+static void do_openrc(const char *runlevel)
 {
 	pid_t pid;
-	sigset_t signals;
+	sigset_t all_signals;
+	sigset_t our_signals;
 
+	sigfillset(&all_signals);
+	/* block all signals */
+	sigprocmask(SIG_BLOCK, &all_signals, &our_signals);
 	pid = fork();
 	switch (pid) {
 		case -1:
 			perror("fork");
+			exit(1);
 			break;
 		case 0:
 			setsid();
 			/* unblock all signals */
-			sigemptyset(&signals);
-			sigprocmask(SIG_SETMASK, &signals, NULL);
+			sigprocmask(SIG_UNBLOCK, &all_signals, NULL);
 			printf("Starting %s runlevel\n", runlevel);
 			execlp("openrc", "openrc", runlevel, NULL);
 			perror("exec");
+			exit(1);
 			break;
 		default:
+			/* restore our signal mask */
+			sigprocmask(SIG_SETMASK, &our_signals, NULL);
+			while (waitpid(pid, NULL, 0) != pid)
+				if (errno == ECHILD)
+					break;
 			break;
 	}
-	return pid;
 }
 
 static void init(const char *default_runlevel)
 {
 	const char *runlevel = NULL;
-	pid_t pid;
-
-	pid = do_openrc("sysinit");
-	waitpid(pid, NULL, 0);
-	pid = do_openrc("boot");
-	waitpid(pid, NULL, 0);
+	do_openrc("sysinit");
+	do_openrc("boot");
 	if (default_runlevel)
 		runlevel = default_runlevel;
 	else
@@ -87,8 +92,7 @@ static void init(const char *default_runlevel)
 		printf("%s is an invalid runlevel\n", runlevel);
 		runlevel = rc_default_runlevel;
 	}
-	pid = do_openrc(runlevel);
-	waitpid(pid, NULL, 0);
+	do_openrc(runlevel);
 	log_wtmp("reboot", "~~", 0, RUN_LVL, "~~");
 }
 
@@ -100,11 +104,9 @@ static void handle_reexec(char *my_name)
 
 static void handle_shutdown(const char *runlevel, int cmd)
 {
-	pid_t pid;
 	struct timespec ts;
 
-	pid = do_openrc(runlevel);
-	while (waitpid(pid, NULL, 0) != pid);
+	do_openrc(runlevel);
 	printf("Sending the final term signal\n");
 	kill(-1, SIGTERM);
 	ts.tv_sec = 3;
@@ -118,10 +120,7 @@ static void handle_shutdown(const char *runlevel, int cmd)
 
 static void handle_single(void)
 {
-	pid_t pid;
-
-	pid = do_openrc("single");
-	while (waitpid(pid, NULL, 0) != pid);
+	do_openrc("single");
 }
 
 static void reap_zombies(void)