.github: try running with older Ubuntu version

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     # Verify we can build on latest Ubuntu with both gcc and clang
     name: ${{ matrix.compiler }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     strategy:
       matrix:
         compiler: [gcc, clang]
@@ -60,7 +60,9 @@ jobs:
           /tmp/sbin/initctl -h
       - name: Run Unit Tests
         run: |
-          make -j1 distcheck
+          ver=$(/tmp/sbin/initctl -V | awk '/Finit.*/ {print $2;}')
+          dir=finit-$ver/_build/sub
+          make -j1 distcheck || (cat $dir/test/setup-root.log; cat $dir/test/test-suite.log; false)
       - name: Upload Test Results
         uses: actions/upload-artifact@v2
         with:

.gitignore

@@ -45,3 +45,6 @@ GTAGS
 /.autoconf
 /.automake
 /.built
+
+# VS Code user settings
+.vscode

ChangeLog.md

@@ -4,6 +4,31 @@ Change Log
 All relevant changes are documented in this file.
 
 
+[4.3][UNRELEASED]
+--------------------
+
+Critical bug fix release.  If you run a 32-bit target with GLIBC 2.34
+you *need* to upgrade!
+
+### Changes
+* Loading `module`s no longer shows arguments in progress output
+* Warning messages in progress output now in yellow, not red, issue 214
+* `initctl`, new command line option `-v,--version` for ease of use
+* Extended environment variables for pre/post scripts, issue #189
+* New condition `done` for run task, issue #207 by Ming Liu, Atlas Copco
+* Refactor parts of shutdown and reboot sequence for PREEMPT-RT kernels,
+  by Robert Andersson, Mathias Thore, and Ming Liu, Atlas Copco
+
+### Fixes
+* Fix nasty 32/64-bit alignment issue between finit and its plugins,
+  applicable to 32-bit targets with GLIBC 2.34 and later.  External
+  plugins must make sure to use, at least: `-D_TIME_BITS=64`
+* Fix #215: disable cgroup support at runtime if kernel lacks support
+  or does not have the required controllers (cpu)
+* Fix #217: iwatcher initialization issue, by Ming Liu, Atlas Copco
+* Fix #218: initctl matches too many services, by Ming Liu, Atlas Copco
+
+
 [4.2][] - 2022-01-16
 --------------------
 
@@ -1039,6 +1064,7 @@ Major bug fix release.
 * Initial release
 
 [UNRELEASED]: https://github.com/troglobit/finit/compare/4.2...HEAD
+[4.3]: https://github.com/troglobit/finit/compare/4.2...4.3
 [4.2]: https://github.com/troglobit/finit/compare/4.1...4.2
 [4.1]: https://github.com/troglobit/finit/compare/4.0...4.1
 [4.0]: https://github.com/troglobit/finit/compare/3.1...4.0

README.md

@@ -1,4 +1,4 @@
-[![License Badge][]][License] [![GitHub Status]][GitHub] [![Coverity Status]][Coverity Scan]
+[![License Badge][]][License] [![GitHub Status][]][GitHub] [![Coverity Status][]][Coverity Scan]
 <img align="right" src="img/finit3.png" alt="Finit: Fast Init">
 
 * [Introduction](#introduction)
@@ -598,7 +598,7 @@ and proposed extensions.
 [Joachim Wiberg]:   https://troglobit.com
 [License]:          https://en.wikipedia.org/wiki/MIT_License
 [License Badge]:    https://img.shields.io/badge/License-MIT-teal.svg
-[GitHub]:           https://travis-ci.org/troglobit/finit
+[GitHub]:           https://github.com/troglobit/finit/actions/workflows/build.yml/
-[GitHub Status]:    https://travis-ci.org/troglobit/finit.svg?branch=master
+[GitHub Status]:    https://github.com/troglobit/finit/actions/workflows/build.yml/badge.svg
 [Coverity Scan]:    https://scan.coverity.com/projects/3545
 [Coverity Status]:  https://scan.coverity.com/projects/3545/badge.svg

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Finit, 4.2, https://github.com/troglobit/finit/issues, finit, https://troglobit.com/finit.html)
+AC_INIT(Finit, 4.3-dev, https://github.com/troglobit/finit/issues, finit, https://troglobit.com/finit.html)
 AC_CONFIG_AUX_DIR(aux)
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects])
 AM_SILENT_RULES([yes])
@@ -14,8 +14,8 @@ AC_CONFIG_FILES([Makefile
 	man/Makefile
 	plugins/Makefile
 	src/Makefile
-	test/test.env
+	test/test.env test/Makefile
-	test/Makefile])
+	test/tenv/Makefile test/common/Makefile])
 
 # Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR()
 #m4_include([m4/plugin.m4])
@@ -86,11 +86,13 @@ enable_all_plugins=auto
 AC_PLUGIN([alsa-utils],    [no],  [Save and restore ALSA sound settings using alsactl])
 AC_PLUGIN([dbus],          [no],  [Setup and start system message bus, D-Bus])
 AC_PLUGIN([modules-load],  [no],  [Scans /etc/modules-load.d for modules to load])
+AC_PLUGIN([modprobe],      [yes], [Coldplug modules using modalias magic])
 AC_PLUGIN([resolvconf],    [no],  [Setup necessary files for resolvconf])
 AC_PLUGIN([x11-common],    [no],  [Console setup (for X)])
 AC_PLUGIN([netlink],       [yes], [Basic netlink plugin for IFUP/IFDN and GW events. Can be replaced with externally built plugin that links with libnl or similar.])
 AC_PLUGIN([hotplug],       [yes], [Setup and start udev or mdev hotplug daemon])
 AC_PLUGIN([rtc],           [yes], [Save and restore RTC using hwclock])
+AC_PLUGIN([tty],           [yes], [Automatically activate new TTYs, e.g. USB-to-serial])
 AC_PLUGIN([urandom],       [yes], [Setup and save random seed at boot/shutdown])
 
 # Check for extra arguments or packages

contrib/patches/linux-4.9-inotify-in-mask-create.patch

@@ -0,0 +1,75 @@
+In Finit issue #196 we were reminded [1] of a missing inotify flag in
+Linux older kernels, IN_MASK_CREATE.  Finit makes use of this internally
+for monitoring PID conditions, and more.  This is a central mechanism to
+synchronize services at boot and reload at runtime.
+
+The following patch for Linux 4.9.0, was provided by Andy Savage for
+other people that may want to run Finit on slightly older kernels.
+
+[1]: https://github.com/troglobit/finit/issues/196
+
+Index: fs/notify/inotify/inotify_user.c
+===================================================================
+--- fs.orig/notify/inotify/inotify_user.c
++++ fs/notify/inotify/inotify_user.c
+@@ -522,6 +522,7 @@ static int inotify_update_existing_watch
+ 	__u32 old_mask, new_mask;
+ 	__u32 mask;
+ 	int add = (arg & IN_MASK_ADD);
++	int create = (arg & IN_MASK_CREATE);
+ 	int ret;
+
+ 	mask = inotify_arg_to_mask(arg);
+@@ -529,6 +530,8 @@ static int inotify_update_existing_watch
+ 	fsn_mark = fsnotify_find_inode_mark(group, inode);
+ 	if (!fsn_mark)
+ 		return -ENOENT;
++	else if (create)
++		return -EEXIST;
+
+ 	i_mark = container_of(fsn_mark, struct inotify_inode_mark, fsn_mark);
+
+@@ -726,6 +729,10 @@ SYSCALL_DEFINE3(inotify_add_watch, int,
+ 	if (unlikely(!f.file))
+ 		return -EBADF;
+
++	/* IN_MASK_ADD and IN_MASK_CREATE don't make sense together */
++	if (unlikely((mask & IN_MASK_ADD) && (mask & IN_MASK_CREATE)))
++		return -EINVAL;
++
+ 	/* verify that this is indeed an inotify instance */
+ 	if (unlikely(f.file->f_op != &inotify_fops)) {
+ 		ret = -EINVAL;
+@@ -814,7 +821,7 @@ static int __init inotify_user_setup(voi
+ 	BUILD_BUG_ON(IN_ISDIR != FS_ISDIR);
+ 	BUILD_BUG_ON(IN_ONESHOT != FS_IN_ONESHOT);
+
+-	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 21);
++	BUG_ON(hweight32(ALL_INOTIFY_BITS) != 22);
+
+ 	inotify_inode_mark_cachep = KMEM_CACHE(inotify_inode_mark, SLAB_PANIC);
+
+Index: include/linux/inotify.h
+===================================================================
+--- include.orig/linux/inotify.h
++++ include/linux/inotify.h
+@@ -17,6 +17,6 @@ extern struct ctl_table inotify_table[];
+ 			  IN_DELETE_SELF | IN_MOVE_SELF | IN_UNMOUNT | \
+ 			  IN_Q_OVERFLOW | IN_IGNORED | IN_ONLYDIR | \
+ 			  IN_DONT_FOLLOW | IN_EXCL_UNLINK | IN_MASK_ADD | \
+-			  IN_ISDIR | IN_ONESHOT)
++			  IN_MASK_CREATE | IN_ISDIR | IN_ONESHOT)
+
+ #endif	/* _LINUX_INOTIFY_H */
+Index: include/uapi/linux/inotify.h
+===================================================================
+--- include.orig/uapi/linux/inotify.h
++++ include/uapi/linux/inotify.h
+@@ -52,6 +52,7 @@ struct inotify_event {
+ #define IN_ONLYDIR		0x01000000	/* only watch the path if it is a directory */
+ #define IN_DONT_FOLLOW		0x02000000	/* don't follow a sym link */
+ #define IN_EXCL_UNLINK		0x04000000	/* exclude events on unlinked objects */
++#define IN_MASK_CREATE		0x10000000	/* only create watches */
+ #define IN_MASK_ADD		0x20000000	/* add to the mask of an already existing watch */
+ #define IN_ISDIR		0x40000000	/* event occurred against dir */
+ #define IN_ONESHOT		0x80000000	/* only send event once */

doc/service.md

@@ -1,7 +1,49 @@
 Finit Services
 ==============
 
-![The service state machine](svc-machine.png "The service state machine")
+Starting & Monitoring
+---------------------
+
+Finit can start and monitor the following types of daemons:
+
+* Forks to background, creates a PID file
+* Runs in foreground:
+  - creates a PID file
+  - does not create a PID file -- Finit can create it for you (optional)
+
+Finit can *not* start and monitor a daemon that:
+
+* Forks to background and does *not* create a PID file
+
+|   | Forking | Creates PID File | Finit creates PID File |
+|---|---------|------------------|------------------------|
+| ✔ | Yes     | Yes              | No                     |
+| ✔ | No      | Yes              | No                     |
+| ✔ | No      | No               | Yes, optionally        |
+| ✘ | Yes     | No               | No                     |
+
+> **Note:** PID files is one mechanism used to assert conditions to
+> synchronize the start and stop of other, dependent, services.
+
+### Forks to Background w/ PID File
+
+    service pid:!/run/serv.pid serv       -- Forking service
+
+### Runs in Foreground w/ PID File
+
+    service                    serv -n -p -- Foreground service w/ PID file
+
+### Runs in Foreground w/o PID File
+
+Same as previous, but we tell Finit to create the PID file, because we
+need it to synchronize start/stop of a dependent service.
+
+    service pid:/run/serv.pid  serv -n    -- Foreground service w/o PID file
+
+### Runs in Foreground w/ Custom PID File
+
+    service pid:/run/servy.pid serv -n -p -P /run/servy.pid -- Foreground service w/ custom PID file
+
 
 State Machine
 -------------
@@ -11,6 +53,8 @@ For `run`s and `task`s there is an additional end state called `DONE`,
 not shown in the diagram for brevity.  Services start in the `HALTED`
 state.
 
+![The service state machine](svc-machine.png "The service state machine")
+
 The current state depends on the two following conditions:
 
 * `E`: Service enabled. In order for `E` to be satisfied, the service

man/initctl.8

@@ -11,7 +11,7 @@
 .Nd Control tool for Finit
 .Sh SYNOPSIS
 .Nm /sbin/initctl
-.Op Fl bcfhlpqtv
+.Op Fl bcfhlpqtvV
 .Op COMMAND
 .Sh DESCRIPTION
 .Nm
@@ -41,16 +41,20 @@ Silent, only return status of command.
 Skip table headings.
 .It Fl v, -verbose
 Verbose output, where applicable.
+.It Fl V, -version
+Show program version.
 .El
 .Sh COMMANDS
 .Bl -tag -width Ds
 .It Nm Ar debug
-Toggle finit (daemon) debug to
+Toggle
+.Nm finit
+(daemon) debug to
 .Pa /dev/console
 .It Nm Ar help
 Show built-in help text
 .It Nm Ar version
-Show Finit (daemon) version
+Show program version
 .It Nm Ar ls | list
 List all
 .Cm *.conf
@@ -136,6 +140,10 @@ Start service by name, with optional ID, e.g.,
 Stop/Pause a running service by name
 .It Nm Ar reload Cm NAME[:ID]
 Reload service by name (SIGHUP or restart)
+.It Nm Ar signal Cm NAME:[ID] S
+Send signal S to service, by name.
+.Cm S
+may be a complete signal name such as SIGHUP, or short name such as HUP, or the signal number such as 1 (SIGHUP).
 .It Nm Ar restart Cm NAME[:ID]
 Restart (stop/start) service by name
 .It Nm Ar status Cm NAME[:ID]

plugins/Makefile.am

@@ -3,11 +3,11 @@ AM_LDFLAGS          = -module -avoid-version -shared
 AM_CFLAGS           = -W -Wall -Wextra -Wno-unused-parameter -std=gnu99
 AM_CPPFLAGS         = -I$(top_srcdir)/src -U_FORTIFY_SOURCE
 AM_CPPFLAGS        += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE -D_DEFAULT_SOURCE
-AM_CPPFLAGS        += $(lite_CFLAGS)
+AM_CPPFLAGS        += $(lite_CFLAGS) $(uev_CFLAGS)
 
 if STATIC
 noinst_LTLIBRARIES  = libplug.la
-libplug_la_SOURCES  = bootmisc.c modprobe.c pidfile.c procps.c sys.c tty.c usr.c
+libplug_la_SOURCES  = bootmisc.c pidfile.c procps.c sys.c usr.c
 
 if BUILD_ALSA_UTILS_PLUGIN
 libplug_la_SOURCES += alsa-utils.c
@@ -25,6 +25,10 @@ if BUILD_MODULES_LOAD_PLUGIN
 libplug_la_SOURCES += modules-load.c
 endif
 
+if BUILD_MODPROBE_PLUGIN
+libplug_la_SOURCES += modprobe.c
+endif
+
 if BUILD_NETLINK_PLUGIN
 libplug_la_SOURCES += netlink.c
 endif
@@ -37,6 +41,10 @@ if BUILD_RTC_PLUGIN
 libplug_la_SOURCES += rtc.c
 endif
 
+if BUILD_TTY_PLUGIN
+libplug_la_SOURCES += tty.c
+endif
+
 if BUILD_URANDOM_PLUGIN
 libplug_la_SOURCES += urandom.c
 endif
@@ -46,7 +54,7 @@ libplug_la_SOURCES += x11-common.c
 endif
 
 else
-pkglib_LTLIBRARIES  = bootmisc.la modprobe.la pidfile.la procps.la sys.la tty.la usr.la
+pkglib_LTLIBRARIES  = bootmisc.la pidfile.la procps.la sys.la usr.la
 
 if BUILD_ALSA_UTILS_PLUGIN
 pkglib_LTLIBRARIES += alsa-utils.la
@@ -64,6 +72,10 @@ if BUILD_MODULES_LOAD_PLUGIN
 pkglib_LTLIBRARIES += modules-load.la
 endif
 
+if BUILD_MODPROBE_PLUGIN
+pkglib_LTLIBRARIES += modprobe.la
+endif
+
 if BUILD_NETLINK_PLUGIN
 pkglib_LTLIBRARIES += netlink.la
 endif
@@ -76,6 +88,10 @@ if BUILD_RTC_PLUGIN
 pkglib_LTLIBRARIES += rtc.la
 endif
 
+if BUILD_TTY_PLUGIN
+pkglib_LTLIBRARIES += tty.la
+endif
+
 if BUILD_URANDOM_PLUGIN
 pkglib_LTLIBRARIES += urandom.la
 endif

plugins/bootmisc.c

@@ -104,9 +104,9 @@ static void clean(void *arg)
 	}
 }
 
-static void ln(const char *target, const char *linkpath, int ignerr)
+static void ln(const char *target, const char *linkpath)
 {
-	if (symlink(target, linkpath) && !ignerr)
+	if (symlink(target, linkpath) && errno != EEXIST)
 		_pe("Failed creating %s -> %s symlink", target, linkpath);
 }
 
@@ -131,11 +131,11 @@ static void setup(void *arg)
 		_d("System with new /run tmpfs ...");
 		if (!fisdir("/run/lock"))
 			makedir("/run/lock", 1777);
-		ln("/run/lock", "/var/lock", 0);
+		ln("/run/lock", "/var/lock");
-		ln("/dev/shm", "/run/shm", 0);
+		ln("/dev/shm", "/run/shm");
 
 		/* compat only, should really be set up by OS/dist */
-		ln("/run", "/var/run", 1);
+		ln("../run", "/var/run");
 	} else {
 		makedir("/var/lock", 1777);
 		makedir("/var/run", 0755);
@@ -189,7 +189,7 @@ static void setup(void *arg)
 	makedir("/var/run/sshd",  01755); /* OpenSSH  */
 
 	if (!fexist("/etc/mtab"))
-		ln("../proc/self/mounts", "/etc/mtab", 1);
+		ln("../proc/self/mounts", "/etc/mtab");
 
 	/* Void Linux has a uuidd that runs as uuid:uuid and needs /run/uuid */
 	mksubsys("/var/run/uuidd", 0755, "uuidd", "uuidd");
@@ -198,7 +198,7 @@ static void setup(void *arg)
 	mksubsys("/var/run/sudo", 0711, "root", "root");
 	mksubsys("/var/run/sudo/ts", 0700, "root", "root");
 	if (whichp("restorecon"))
-		run("restorecon /var/run/sudo /var/run/sudo/ts");
+		run("restorecon /var/run/sudo /var/run/sudo/ts", "restorecon");
 
 	umask(prev);
 }

plugins/procps.c

@@ -34,9 +34,7 @@
 
 static void setup(void *arg)
 {
-	size_t i;
 	glob_t gl;
-	char buf[160];
 
 	if (rescue) {
 		_d("Skipping %s plugin in rescue mode.", __FILE__);
@@ -51,9 +49,13 @@ static void setup(void *arg)
 	glob("/mnt/sysctl.d/*.conf",           GLOB_APPEND, NULL, &gl);
 	glob("/etc/sysctl.conf",               GLOB_APPEND, NULL, &gl);
 	if (gl.gl_pathc > 0) {
+		size_t i;
+
 		for (i = 0; i < gl.gl_pathc; i++) {
-			snprintf(buf, sizeof(buf), "/sbin/sysctl -e -p %s >/dev/null", gl.gl_pathv[i]);
+			char cmd[160];
-			run(buf);
+
+			snprintf(cmd, sizeof(cmd), "/sbin/sysctl -e -p %s >/dev/null", gl.gl_pathv[i]);
+			run(cmd, "sysctl");
 		}
 		globfree(&gl);
 	}

plugins/sys.c

@@ -160,19 +160,23 @@ static void sys_init(void *arg)
 	char sysdir[MAX_ARG_LEN];
 	char *path;
 
+	_d("Calling mkpath() on sys conds");
 	if (mkpath(pid_runpath(_PATH_CONDSYS, sysdir, sizeof(sysdir)), 0755) && errno != EEXIST) {
 		_pe("Failed creating %s condition directory, %s", COND_SYS, _PATH_CONDSYS);
 		return;
 	}
 
+	_d("Calling realpth() on condsys");
 	path = realpath(_PATH_CONDSYS, NULL);
 	if (!path) {
 		_pe("Cannot figure out real path to %s, aborting", _PATH_CONDSYS);
 		return;
 	}
 
+	_d("Calling iwatch_add()");
 	if (iwatch_add(&iw_sys, path, IN_ONLYDIR))
 		iwatch_exit(&iw_sys);
+	_d("Done.");
 }
 
 static plugin_t plugin = {

plugins/x11-common.c

@@ -58,7 +58,7 @@ static void setup(void *arg)
 	if ((fd = open("/var/run/console/console.lock", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
 		write(fd, username, strlen(username));
 		close(fd);
-		run("pam_console_apply");
+		run("pam_console_apply", "pam-console");
 	}
 #endif
 
@@ -66,7 +66,7 @@ static void setup(void *arg)
 	makedir("/tmp/.ICE-unix", 01777);
 
 	if (whichp("restorecon"))
-		run("restorecon /tmp/.ICE-unix /tmp/.X11-unix");
+		run("restorecon /tmp/.ICE-unix /tmp/.X11-unix", "restorecon");
 
 	umask(prev);
 }

src/api.c

@@ -51,12 +51,12 @@
 extern svc_t *wdog;
 static uev_t api_watcher;
 
-static int call(int (*action)(svc_t *), char *buf, size_t len)
+static int call(int (*action)(svc_t *, void *), char *buf, size_t len)
 {
-	return svc_parse_jobstr(buf, len, action, NULL);
+	return svc_parse_jobstr(buf, len, NULL, action, NULL);
 }
 
-static int stop(svc_t *svc)
+static int stop(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -67,7 +67,7 @@ static int stop(svc_t *svc)
 	return 0;
 }
 
-static int start(svc_t *svc)
+static int start(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -83,7 +83,7 @@ static int start(svc_t *svc)
  *       responsibility of initctl to do.  Otherwise we'd block PID 1,
  *       or introduce some nasty race conditions.
  */
-static int restart(svc_t *svc)
+static int restart(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -95,7 +95,7 @@ static int restart(svc_t *svc)
 	return 0;
 }
 
-static int reload(svc_t *svc)
+static int reload(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -114,8 +114,28 @@ static int do_start  (char *buf, size_t len) { return call(start,   buf, len); }
 static int do_restart(char *buf, size_t len) { return call(restart, buf, len); }
 static int do_reload (char *buf, size_t len) { return call(reload,  buf, len); }
 
+static int do_signal_svc(svc_t *svc, void *user_data)
+{
+	int signo;
+
+	if (!svc || !user_data || !svc_is_running(svc))
+		return 1;
+
+	signo = *(int *)user_data;
+	return !!kill(svc->pid, signo);
+}
+
+static int do_signal(char *buf, size_t len, int sig)
+{
+	/* Sanity check: do we know this signal? */
+	if (!*sig2str(sig))
+		return 1;
+
+	return svc_parse_jobstr(buf, len, &sig, do_signal_svc, NULL);
+}
+
 static char query_buf[368];
-static int missing(char *job, char *id)
+static int missing(char *job, char *id, void *user_data)
 {
 	char buf[20];
 
@@ -133,7 +153,7 @@ static int missing(char *job, char *id)
 static int do_query(char *buf, size_t len)
 {
 	query_buf[0] = 0;
-	if (svc_parse_jobstr(buf, len, NULL, missing)) {
+	if (svc_parse_jobstr(buf, len, NULL, NULL, missing)) {
 		memcpy(buf, query_buf, len);
 		return 1;
 	}
@@ -407,7 +427,7 @@ static void api_cb(uev_t *w, void *arg, int events)
 
 				if (wdog->protect) {
 					logit(LOG_NOTICE, "Stopping and deleting built-in watchdog.");
-					stop(wdog);
+					stop(wdog, NULL);
 					svc_del(wdog);
 				}
 			}
@@ -443,6 +463,13 @@ static void api_cb(uev_t *w, void *arg, int events)
 			send_svc(sd, do_find_byc(rq.data, sizeof(rq.data)));
 			goto leave;
 
+		case INIT_CMD_SIGNAL:
+			/* runlevel is reused for signal */
+			_d("svc signal %d: %s", rq.runlevel, rq.data);
+			strterm(rq.data, sizeof(rq.data));
+			result = do_signal(rq.data, sizeof(rq.data), rq.runlevel);
+			break;
+
 		default:
 			_d("Unsupported cmd: %d", rq.cmd);
 			break;

src/cgroup.c

@@ -466,8 +466,10 @@ void cgroup_init(uev_ctx_t *ctx)
 	if (mount("none", FINIT_CGPATH, "cgroup2", opts, NULL)) {
 		if (errno == ENOENT)
 			logit(LOG_NOTICE, "Kernel does not support cgroups v2, disabling.");
+		else if (errno == EPERM) /* Probably inside an unpriviliged container */
+			logit(LOG_NOTICE, "Not allowed to mount cgroups v2, disabling.");
 		else
-			_pe("Failed mounting cgroup v2, disabling.");
+			_pe("Failed mounting cgroup v2");
 		avail = 0;
 		return;
 	}
@@ -477,6 +479,7 @@ void cgroup_init(uev_ctx_t *ctx)
 	fp = fopen(FINIT_CGPATH "/cgroup.controllers", "r");
 	if (!fp) {
 		_pe("Failed opening %s", FINIT_CGPATH "/cgroup.controllers");
+	abort:
 		umount(FINIT_CGPATH);
 		avail = 0;
 		return;
@@ -494,9 +497,26 @@ void cgroup_init(uev_ctx_t *ctx)
 
 	fclose(fp);
 
+	/* Check for cpu controller, abort if missing */
+	if (!strstr(controllers, "+cpu")) {
+		logit(LOG_NOTICE, "Missing CPU controller, disabling cgroup support.");
+		goto abort;
+	}
+
 	/* Enable all controllers */
-	if (fnwrite(controllers, FINIT_CGPATH "/cgroup.subtree_control"))
+	if (fnwrite(controllers, FINIT_CGPATH "/cgroup.subtree_control")) {
 		_pe("Failed enabling %s for %s", controllers, FINIT_CGPATH "/cgroup.subtree_control");
+		goto abort;
+	}
+
+	/* prepare cgroup.events watcher */
+	fd = iwatch_init(&iw_cgroup);
+	if (uev_io_init(ctx, &cgw, cgroup_events_cb, NULL, fd, UEV_READ)) {
+		_pe("Failed setting up cgroup.events watcher");
+		iwatch_exit(&iw_cgroup);
+		close(fd);
+		goto abort;
+	}
 
 	/* Default (protected) groups, PID 1, services, and user/login processes */
 	cgroup_add("init",   "cpu.weight:100",  1);
@@ -505,14 +525,12 @@ void cgroup_init(uev_ctx_t *ctx)
 	cgroup_config();
 
 	/* Move ourselves to init (best effort, otherwise run in 'root' group */
-	if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs"))
+	if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs")) {
 		_pe("Failed moving PID 1 to cgroup ", FINIT_CGPATH "/init");
-
+		uev_io_stop(&cgw);
-	/* prepare cgroup.events watcher */
+		iwatch_exit(&iw_cgroup);
-	fd = iwatch_init(&iw_cgroup);
-	if (uev_io_init(ctx, &cgw, cgroup_events_cb, NULL, fd, UEV_READ)) {
-		_pe("Failed setting up cgroup.events watcher");
 		close(fd);
+		goto abort;
 	}
 }
 

src/client.c

@@ -86,11 +86,13 @@ int client_send(struct init_request *rq, ssize_t len)
 	}
 
 	pfd.fd = sd;
-	pfd.events = POLLIN;
+	pfd.events = POLLIN | POLLERR | POLLHUP;
 	if ((rc = poll(&pfd, 1, 2000)) <= 0) {
-		if (rc)
+		if (rc) {
+			if (errno == EINTR) /* shutdown/reboot */
+				goto exit;
 			warn("poll(), errno %d", errno);
-		else
+		} else
 			warnx("Timed out waiting for reply from Finit.");
 		goto exit;
 	}

src/conf.c

@@ -211,22 +211,18 @@ void conf_parse_cmdline(int argc, char *argv[])
 
 static int kmod_exists(char *mod)
 {
+	char buf[256];
 	int found = 0;
 	FILE *fp;
-	char buf[256];
-	size_t len;
-
-	for (len = 0; mod[len]; len++) {
-		if (mod[len] == ' ' || mod[len] == '\t')
-			break;
-	}
 
 	fp = fopen("/proc/modules", "r");
 	if (!fp)
 		return 0;
 
-	while (!found && (fgets(buf, sizeof(buf), fp))) {
+	while (!found && fgets(buf, sizeof(buf), fp)) {
-		if (!strncmp(buf, mod, len))
+		char *kmod = strtok(buf, " \t");
+
+		if (kmod && !strcmp(kmod, mod))
 			found = 1;
 	}
 	fclose(fp);
@@ -234,22 +230,26 @@ static int kmod_exists(char *mod)
 	return found;
 }
 
-static void kmod_load(char *line)
+static void kmod_load(char *mod)
 {
-	char *mod;
+	char module[64] = { 0 };
 	char cmd[CMD_SIZE];
 
 	if (runlevel != 0)
 		return;
 
-	mod = strip_line(line);
+	/* Strip args for progress below and kmod_exists() */
-	if (kmod_exists(mod))
+	strlcpy(module, mod, sizeof(module));
+	if (!strtok(module, " \t"))
+		return;
+
+	if (kmod_exists(module))
 		return;
 
 	strcpy(cmd, "modprobe ");
 	strlcat(cmd, mod, sizeof(cmd));
 
-	run_interactive(cmd, "Loading kernel module %s", mod);
+	run_interactive(cmd, "Loading kernel module %s", module);
 }
 
 /* Convert optional "[!123456789S]" string into a bitmask */
@@ -502,7 +502,7 @@ static void parse_static(char *line, int is_rcsd)
 
 	/* Kernel module to load */
 	if (BOOTSTRAP && MATCH_CMD(line, "module ", x)) {
-		kmod_load(x);
+		kmod_load(strip_line(x));
 		return;
 	}
 

src/exec.c

@@ -28,6 +28,7 @@
 #include <dirent.h>
 #include <err.h>
 #include <stdarg.h>
+#include <sysexits.h>
 #include <sys/ioctl.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
@@ -70,89 +71,126 @@ int complete(char *cmd, int pid)
 	return status;
 }
 
-int run(char *cmd)
+static int do_redirect(void)
+{
+	FILE *fp;
+
+	fp = fopen("/dev/null", "w");
+	if (fp) {
+		int fd = fileno(fp);
+
+		dup2(fd, STDIN_FILENO);
+		dup2(fd, STDOUT_FILENO);
+		dup2(fd, STDERR_FILENO);
+
+		return fclose(fp);
+	}
+
+	return -1;
+}
+
+/*
+ * Run 'cmd' and wait for completion.  If 'log' is not NULL any output
+ * from the command is logged with the given string as prefix, use "" to
+ * skip.  If 'log' is NULL all output is redirected to /dev/null, which
+ * is what this function originally did.
+ */
+int run(char *cmd, char *log)
 {
 	int status, result, i = 0;
-	char *args[NUM_ARGS + 1], *arg, *backup;
+	char *args[NUM_ARGS + 1], *arg;
+	char *backup = NULL;
 	pid_t pid;
 
-	/* We must create a copy that is possible to modify. */
+	if (!log) {
-	backup = arg = strdup(cmd);
+		/* We must create a copy that is possible to modify. */
-	if (!arg)
+		backup = arg = strdup(cmd);
-		return 1; /* Failed allocating a string to be modified. */
+		if (!arg)
+			return 1;
 
-	/* Split command line into tokens of an argv[] array. */
+		/* Split command line into tokens of an argv[] array. */
-	args[i++] = strsep(&arg, "\t ");
+		args[i++] = strsep(&arg, "\t ");
-	while (arg && i < NUM_ARGS) {
+		while (arg && i < NUM_ARGS) {
-		/* Handle run("su -c \"dbus-daemon --system\" messagebus");
+			/* Handle run("su -c \"dbus-daemon --system\" messagebus");
-		 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
+			 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
-		if (*arg == '\'' || *arg == '"') {
+			if (*arg == '\'' || *arg == '"') {
-			char *p, delim[2] = " ";
+				char *p, delim[2] = " ";
 
-			delim[0]  = arg[0];
+				delim[0]  = arg[0];
-			args[i++] = arg++;
+				args[i++] = arg++;
-			strsep(&arg, delim);
+				strsep(&arg, delim);
-			 p     = arg - 1;
+				 p     = arg - 1;
-			*p     = *delim;
+				*p     = *delim;
-			*arg++ = 0;
+				*arg++ = 0;
-		} else {
+			} else {
-			args[i++] = strsep(&arg, "\t ");
+				args[i++] = strsep(&arg, "\t ");
+			}
 		}
-	}
+		args[i] = NULL;
-	args[i] = NULL;
 
-	if (i == NUM_ARGS && arg) {
+		if (i == NUM_ARGS && arg) {
-		_e("Command too long: %s", cmd);
+			_e("Command too long: %s", cmd);
-		free(backup);
+			free(backup);
-		errno = EOVERFLOW;
+			errno = EOVERFLOW;
-		return 1;
+			return 1;
+		}
 	}
 
 	pid = fork();
 	if (0 == pid) {
-		FILE *fp;
+		int rc = EX_OSERR;
 
 		setsid();
+		sig_unblock();
+		if (!log) {
+			do_redirect();
+			execvp(args[0], args);
+		} else {
+			char *pfx = *log ? ": " : "";
+			FILE *pp;
 
-		/* Always redirect stdio for run() */
+			pp = popen(cmd, "r");
-		fp = fopen("/dev/null", "w");
+			if (pp) {
-		if (fp) {
+				char buf[256];
-			int fd = fileno(fp);
 
-			dup2(fd, STDIN_FILENO);
+				while (fgets(buf, sizeof(buf), pp)) {
-			dup2(fd, STDOUT_FILENO);
+					chomp(buf);
-			dup2(fd, STDERR_FILENO);
+					logit(LOG_NOTICE, "%s%s%s", log, pfx, buf);
+				}
+
+				rc = pclose(pp);
+			}
 		}
 
-		sig_unblock();
+		_exit(rc);
-		execvp(args[0], args);
-
-		_exit(1); /* Only if execv() fails. */
 	} else if (-1 == pid) {
 		_pe("%s", args[0]);
-		free(backup);
+		if (backup)
+			free(backup);
 
 		return -1;
 	}
 
 	status = complete(args[0], pid);
 	if (-1 == status) {
-		free(backup);
+		if (backup)
+			free(backup);
 		return 1;
 	}
 
 	result = WEXITSTATUS(status);
 	if (WIFEXITED(status)) {
-		_d("Started %s and ended OK: %d", args[0], result);
+		_d("Started '%s' and exit without signal, status: %d", cmd, result);
 	} else if (WIFSIGNALED(status)) {
-		_d("Process %s terminated by signal %d", args[0], WTERMSIG(status));
+		_d("Process '%s' terminated by signal %d", cmd, WTERMSIG(status));
 		if (!result)
 			result = 1; /* Must alert callee that the command did complete successfully.
 				     * This is necessary since not all programs trap signals and
 				     * change their return code accordingly. --Jocke */
 	}
 
-	free(backup);
+	if (backup)
+		free(backup);
 
 	return result;
 }
@@ -186,7 +224,7 @@ int run_interactive(char *cmd, char *fmt, ...)
 	}
 
 	/* Run cmd ... */
-	status = run(cmd);
+	status = run(cmd, "");
 
 	/* Restore stderr/stdout */
 	if (fp && !debug) {
@@ -222,7 +260,6 @@ int run_interactive(char *cmd, char *fmt, ...)
 
 int exec_runtask(char *cmd, char *args[])
 {
-	size_t i;
 	char buf[1024] = "";
 	char *argv[4] = {
 		"sh",
@@ -230,6 +267,7 @@ int exec_runtask(char *cmd, char *args[])
 		buf,
 		NULL
 	};
+	size_t i;
 
 	strlcat(buf, cmd, sizeof(buf));
 	for (i = 1; args[i]; i++) {

src/finit.c

@@ -333,7 +333,8 @@ static void fs_mount_all(void)
 	_d("Calling extra mount hook, after mount -a ...");
 	plugin_run_hooks(HOOK_MOUNT_POST);
 
-	run("swapon -ea");
+	if (whichp("swapon"))
+		run("swapon -ea", "swapon");
 
 	_d("Finalize, ensure common file systems are available ...");
 	fs_finalize();

src/finit.h

@@ -95,6 +95,7 @@
 #define INIT_CMD_SVC_QUERY      130
 #define INIT_CMD_SVC_FIND       131
 #define INIT_CMD_SVC_FIND_BYC   132
+#define INIT_CMD_SIGNAL         133
 #define INIT_CMD_NACK           254
 #define INIT_CMD_ACK            255
 

src/helpers.c

@@ -30,6 +30,7 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stdarg.h>
+#include <sysexits.h>
 #include <sys/ioctl.h>
 #ifdef _LIBITE_LITE
 # include <libite/lite.h>
@@ -40,6 +41,7 @@
 #include "finit.h"
 #include "helpers.h"
 #include "private.h"
+#include "sig.h"
 #include "util.h"
 #include "utmp-api.h"
 
@@ -57,7 +59,7 @@ static pstyle_t progress_style = PROGRESS_DEFAULT;
 #define STATUS_CLASS {							\
 	CHOOSE(" OK ",  " OK ",  "\e[1;32m"),		/* Green  */	\
 	CHOOSE("FAIL",  "FAIL",  "\e[1;31m"),		/* Red    */	\
-	CHOOSE("WARN",  "WARN",  "\e[1;31m"),		/* Red    */	\
+	CHOOSE("WARN",  "WARN",  "\e[1;33m"),		/* Yellow */	\
 	CHOOSE(" \\/ ", " ⋯  ", "\e[1;33m"),		/* Yellow */	\
 }
 
@@ -493,27 +495,46 @@ void networking(int updown)
 
 	/* Debian/Ubuntu/Busybox/RH/Suse */
 	if (!whichp("ifup"))
-		goto done;
+		goto fallback;
 
 	if (fexist("/etc/network/interfaces")) {
 		pid_t pid;
 
+		if (!updown) {
+			run_interactive("ifdown -a", "Stopping networking");
+			goto done;
+		}
+
 		pid = fork();
 		if (pid == 0) {
-			if (updown)
+			int rc = EX_OSERR;
-				run("ifup -a");
+			FILE *pp;
-			else
+
-				run("ifdown -a");
+			setsid();
-			_exit(0);
+			sig_unblock();
+
+			pp = popen("ifup -a 2>&1", "r");
+			if (pp) {
+				char buf[256];
+
+				while (fgets(buf, sizeof(buf), pp))
+					logit(LOG_NOTICE, "network: %s", buf);
+
+				rc = pclose(pp);
+			}
+
+			_exit(rc);
 		}
 		cgroup_service("network", pid, NULL);
+		print(pid > 0 ? 0 : 1, "Bringing up network interfaces ...");
 
-		print(pid > 0 ? 0 : 1, "%s networking", updown ? "Starting" : "Stopping");
+		goto done;
 	}
 
-done:
+fallback:
 	/* Fall back to bring up at least loopback */
 	ifconfig("lo", "127.0.0.1", "255.0.0.0", updown);
+done:
 
 	/* Hooks that rely on loopback, or basic networking being up. */
 	if (updown) {
@@ -522,6 +543,44 @@ done:
 	}
 }
 
+/*
+ * Very basic, and incomplete, check if we're running in a container.
+ */
+int in_container(void)
+{
+	const char *containers[] = {
+		"lxc",
+		"docker",
+		"kubepod",
+		"unshare"
+	};
+	const char *files[] = {
+		"/run/.containerenv",
+		"/.dockerenv"
+	};
+	static int incont = -1;
+	size_t i;
+	char *c;
+
+	if (incont > 0)
+		return incont;
+
+	c = getenv("container");
+	if (c) {
+		for (i = 0; i < NELEMS(containers); i++) {
+			if (!strcmp(containers[i], c))
+				return incont = 1;
+		}
+	}
+
+	for (i = 0; i < NELEMS(files); i++) {
+		if (!access(files[i], F_OK))
+			return incont = 1;
+	}
+
+	return 0;
+}
+
 #ifndef HAVE_GETFSENT
 static lfile_t *fstab = NULL;
 

src/helpers.h

@@ -93,9 +93,10 @@ int     mksubsys        (const char *dir, mode_t mode, char *user, char *group);
 
 void    set_hostname    (char **hostname);
 void    networking      (int updown);
+int     in_container    (void);
 
 int     complete        (char *cmd, int pid);
-int     run             (char *cmd);
+int     run             (char *cmd, char *log);
 int     run_interactive (char *cmd, char *fmt, ...);
 int     exec_runtask    (char *cmd, char *args[]);
 pid_t   run_getty       (char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[]);

src/initctl.c

@@ -52,6 +52,7 @@ struct cmd {
 	struct cmd  *ctx;
 	int        (*cb)(char *arg);
 	int         *cond;
+	int        (*cb_multiarg)(int argc, char **argv);
 };
 
 int icreate  = 0;
@@ -160,8 +161,11 @@ static int do_log(char *svc)
 	if (!svc || !svc[0])
 		svc = "finit";
 
-	if (!fexist(logfile))
+	if (!fexist(logfile)) {
 		logfile = "/var/log/messages";
+		if (!fexist(logfile))
+			return 0; /* bail out, maybe in container */
+	}
 
 	return systemf("cat %s | grep %s | tail -10", logfile, svc);
 }
@@ -275,6 +279,61 @@ static int do_restart(char *arg)
 	return do_startstop(INIT_CMD_RESTART_SVC, arg);
 }
 
+/**
+ * do_signal - Ask finit to send a signal to a service.
+ * @argv: must point to an array of strings, containing a service
+ *        and signal name, in that order.
+ * @argc: must be 2.
+ *
+ * A signal can be a complete signal name such as "SIGHUP", or
+ * it can be the shortest unique name, such as "HUP" (no SIG prefix).
+ * It can also be a raw signal number, such as "9" (SIGKILL).
+ */
+int do_signal(int argc, char *argv[])
+{
+	struct init_request rq = {
+		.magic = INIT_MAGIC,
+		.cmd   = INIT_CMD_SVC_QUERY
+	};
+	int signo;
+
+	if (argc != 2)
+		errx(1, "invalid number of arguments to signal");
+
+	/* Validate service name */
+	strlcpy(rq.data, argv[0], sizeof(rq.data));
+	if (client_send(&rq, sizeof(rq))) {
+		fprintf(stderr, "No such task or service(s): %s\n\n", argv[0]);
+		goto show_usage;
+	}
+
+	/* Validate signal name (or number) */
+	signo = str2sig(argv[1]);
+	if (signo == -1) {
+		/* Not a signal name, is it an actual signal number? */
+		errno = 0;
+		signo = (int)strtol(argv[1], NULL, 10);
+
+		/* Was it a number? Was it a signo that finit recognizes? */
+		if (errno || !*(sig2str(signo))) {
+			fprintf(stderr, "Not a valid signal (or signo): %s\n", argv[1]);
+			goto show_usage;
+		}
+	}
+
+	/* Reuse runlevel for signal number. */
+	rq.magic    = INIT_MAGIC;
+	rq.cmd      = INIT_CMD_SIGNAL;
+	rq.runlevel = signo;
+	strlcpy(rq.data, argv[0], sizeof(rq.data));
+
+	return client_send(&rq, sizeof(rq));
+
+show_usage:
+	fprintf(stderr, "Usage: initctl signal <NAME>[:ID] <S>\n");
+	return 1;
+}
+
 static int dump_one_cond(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf)
 {
 	const char *cond, *asserted;
@@ -292,7 +351,7 @@ static int dump_one_cond(const char *fpath, const struct stat *sb, int tflag, st
 	if (strncmp("pid/", cond, 4) == 0) {
 		svc_t *svc;
 
-		svc= client_svc_find_by_cond(cond);
+		svc = client_svc_find_by_cond(cond);
 		if (!svc) {
 			nm  = "unknown";
 			pid = 0;
@@ -722,7 +781,7 @@ static int show_status(char *arg)
 
 		for (svc = client_svc_iterator(1); svc; svc = client_svc_iterator(0)) {
 			svc_ident(svc, ident, sizeof(ident));
-			if (string_match(ident, arg))
+			if (string_compare(ident, arg))
 				num++;
 			if (string_case_compare(ident, arg))
 				exact++;
@@ -735,8 +794,15 @@ static int show_status(char *arg)
 		if (!svc)
 			return 255;
 
-		if (quiet)
+		if (quiet) {
-			return svc->state != SVC_RUNNING_STATE;
+			if (svc_is_runtask(svc))
+				if (svc->started)
+					return 0;
+				else
+					return 1;
+			else
+				return svc->state != SVC_RUNNING_STATE;
+		}
 
 		pidfn = svc->pidfile;
 		if (pidfn[0] == '!')
@@ -765,6 +831,8 @@ static int show_status(char *arg)
 			char *group;
 
 			group = pid_cgroup(svc->pid, grbuf, sizeof(grbuf));
+			if (!group)
+				goto no_cgroup; /* ... or PID doesn't exist (anymore) */
 			snprintf(path, sizeof(path), "%s/%s", FINIT_CGPATH, group);
 			cg = cg_conf(path);
 
@@ -774,6 +842,7 @@ static int show_status(char *arg)
 			       cg->cg_mem.min, cg->cg_mem.max);
 			show_cgroup_tree(group, "              ");
 		}
+	no_cgroup:
 		printf("\n");
 
 		return do_log(svc->cmd);
@@ -797,7 +866,7 @@ static int show_status(char *arg)
 		char *lvls;
 
 		svc_ident(svc, ident, sizeof(ident));
-		if (num && !string_match(ident, arg))
+		if (num && !string_compare(ident, arg))
 			continue;
 
 		printf("%-*d  ", pw, svc->pid);
@@ -891,12 +960,13 @@ static int usage(int rc)
 		"  -q, --quiet               Silent, only return status of command\n"
 		"  -t, --no-heading          Skip table headings\n"
 		"  -v, --verbose             Verbose output\n"
+		"  -V, --version             Show program version\n"
 		"  -h, --help                This help text\n"
 		"\n"
 		"Commands:\n"
 		"  debug                     Toggle Finit (daemon) debug\n"
 		"  help                      This help text\n"
-		"  version                   Show Finit version\n"
+		"  version                   Show program version\n"
 		"\n", prognm);
 
 	if (has_rcsd)
@@ -920,10 +990,10 @@ static int usage(int rc)
 			"  disable  <CONF>           Disable  .conf in %s\n", ena);
 	if (has_rcsd)
 		fprintf(stderr,
-			"  reload                    Reload  *.conf in " FINIT_RCSD " (activate changes)\n");
+			"  reload                    Reload   *.conf in " FINIT_RCSD " (activate changes)\n");
 	else
 		fprintf(stderr,
-			"  reload                    Reload " FINIT_CONF " (activate changes)\n");
+			"  reload                    Reload   " FINIT_CONF " (activate changes)\n");
 
 	fprintf(stderr,
 //		"  reload   <NAME>[:ID]      Reload (SIGHUP) service by name\n"  
@@ -938,6 +1008,7 @@ static int usage(int rc)
 		"  stop     <NAME>[:ID]      Stop/Pause a running service by name\n"
 		"  reload   <NAME>[:ID]      Reload service by name (SIGHUP or restart)\n"
 		"  restart  <NAME>[:ID]      Restart (stop/start) service by name\n"
+		"  signal   <NAME>[:ID] <S>  Send signal S to service by name, with optional ID\n"
 		"  ident    [NAME]           Show matching identities for NAME, or all\n"
 		"  status   <NAME>[:ID]      Show service status, by name\n"
 		"  status                    Show status of services, default command\n");
@@ -994,12 +1065,15 @@ static int cmd_parse(int argc, char *argv[], struct cmd *command)
 		if (!cmd_cond(&command[i]))
 			continue;
 
-		if (!string_match(command[i].cmd, argv[0]))
+		if (!string_compare(command[i].cmd, argv[0]))
 			continue;
 
 		if (command[i].ctx)
 			return cmd_parse(argc - 1, &argv[1], command[i].ctx);
 
+		if (command[i].cb_multiarg)
+			return command[i].cb_multiarg(argc - 1, argv + 1);
+
 		if (command[i].cb) {
 			int rc = 0;
 
@@ -1018,6 +1092,7 @@ static int cmd_parse(int argc, char *argv[], struct cmd *command)
 
 	return command[0].cb(NULL); /* default cmd */
 }
+
 int main(int argc, char *argv[])
 {
 	struct option long_options[] = {
@@ -1031,55 +1106,57 @@ int main(int argc, char *argv[])
 		{ "quiet",      0, NULL, 'q' },
 		{ "no-heading", 0, NULL, 't' },
 		{ "verbose",    0, NULL, 'v' },
+		{ "version",    0, NULL, 'V' },
 		{ NULL, 0, NULL, 0 }
 	};
 	struct cmd cond[] = {
-		{ "status",   NULL, do_cond_show, NULL }, /* default cmd */
+		{ "status",   NULL, do_cond_show, NULL, NULL }, /* default cmd */
-		{ "dump",     NULL, do_cond_dump, NULL },
+		{ "dump",     NULL, do_cond_dump, NULL, NULL  },
-		{ "set",      NULL, do_cond_set,  NULL },
+		{ "set",      NULL, do_cond_set,  NULL, NULL  },
-		{ "clr",      NULL, do_cond_clr,  NULL },
+		{ "clr",      NULL, do_cond_clr,  NULL, NULL  },
-		{ "clear",    NULL, do_cond_clr,  NULL },
+		{ "clear",    NULL, do_cond_clr,  NULL, NULL  },
-		{ NULL, NULL, NULL, NULL }
+		{ NULL, NULL, NULL, NULL, NULL  }
 	};
 	struct cmd command[] = {
-		{ "status",   NULL, show_status,  NULL }, /* default cmd */
+		{ "status",   NULL, show_status,  NULL, NULL  }, /* default cmd */
-		{ "ident",    NULL, show_ident,   NULL },
+		{ "ident",    NULL, show_ident,   NULL, NULL  },
 
-		{ "debug",    NULL, toggle_debug, NULL },
+		{ "debug",    NULL, toggle_debug, NULL, NULL  },
-		{ "devel",    NULL, do_devel,     NULL },
+		{ "devel",    NULL, do_devel,     NULL, NULL  },
-		{ "help",     NULL, do_help,      NULL },
+		{ "help",     NULL, do_help,      NULL, NULL  },
-		{ "version",  NULL, show_version, NULL },
+		{ "version",  NULL, show_version, NULL, NULL  },
 
-		{ "list",     NULL, serv_list,    NULL },
+		{ "list",     NULL, serv_list,    NULL, NULL  },
-		{ "ls",       NULL, serv_list,    NULL },
+		{ "ls",       NULL, serv_list,    NULL, NULL  },
-		{ "enable",   NULL, serv_enable,  NULL },
+		{ "enable",   NULL, serv_enable,  NULL, NULL  },
-		{ "disable",  NULL, serv_disable, NULL },
+		{ "disable",  NULL, serv_disable, NULL, NULL  },
-		{ "touch",    NULL, serv_touch,   NULL },
+		{ "touch",    NULL, serv_touch,   NULL, NULL  },
-		{ "show",     NULL, serv_show,    NULL },
+		{ "show",     NULL, serv_show,    NULL, NULL  },
-		{ "edit",     NULL, serv_edit,    NULL },
+		{ "edit",     NULL, serv_edit,    NULL, NULL  },
-		{ "create",   NULL, serv_creat,   NULL },
+		{ "create",   NULL, serv_creat,   NULL, NULL  },
-		{ "delete",   NULL, serv_delete,  NULL },
+		{ "delete",   NULL, serv_delete,  NULL, NULL  },
-		{ "reload",   NULL, do_reload,    NULL },
+		{ "reload",   NULL, do_reload,    NULL, NULL  },
 
-		{ "cond",     cond, NULL, NULL         },
+		{ "cond",     cond, NULL, NULL, NULL          },
 
-		{ "log",      NULL, do_log,       NULL },
+		{ "log",      NULL, do_log,       NULL, NULL  },
-		{ "start",    NULL, do_start,     NULL },
+		{ "start",    NULL, do_start,     NULL, NULL  },
-		{ "stop",     NULL, do_stop,      NULL },
+		{ "stop",     NULL, do_stop,      NULL, NULL  },
-		{ "restart",  NULL, do_restart,   NULL },
+		{ "restart",  NULL, do_restart,   NULL, NULL  },
+		{ "signal",   NULL, NULL,         NULL, do_signal  },
 
-		{ "cgroup",   NULL, show_cgroup, &cgrp },
+		{ "cgroup",   NULL, show_cgroup, &cgrp, NULL  },
-		{ "ps",       NULL, show_cgps,   &cgrp },
+		{ "ps",       NULL, show_cgps,   &cgrp, NULL  },
-		{ "top",      NULL, show_cgtop,  &cgrp },
+		{ "top",      NULL, show_cgtop,  &cgrp, NULL  },
 
-		{ "runlevel", NULL, do_runlevel,  NULL },
+		{ "runlevel", NULL, do_runlevel,  NULL, NULL  },
-		{ "reboot",   NULL, do_reboot,    NULL },
+		{ "reboot",   NULL, do_reboot,    NULL, NULL  },
-		{ "halt",     NULL, do_halt,      NULL },
+		{ "halt",     NULL, do_halt,      NULL, NULL  },
-		{ "poweroff", NULL, do_poweroff,  NULL },
+		{ "poweroff", NULL, do_poweroff,  NULL, NULL  },
-		{ "suspend",  NULL, do_suspend,   NULL },
+		{ "suspend",  NULL, do_suspend,   NULL, NULL  },
 
-		{ "utmp",     NULL, do_utmp,     &utmp },
+		{ "utmp",     NULL, do_utmp,     &utmp, NULL  },
-		{ NULL, NULL, NULL, NULL }
+		{ NULL, NULL, NULL, NULL, NULL  }
 	};
 	int interactive = 1, c;
 
@@ -1090,7 +1167,7 @@ int main(int argc, char *argv[])
 	cgrp = cgroup_avail();
 	utmp = has_utmp();
 
-	while ((c = getopt_long(argc, argv, "1bcdfh?pqtv", long_options, NULL)) != EOF) {
+	while ((c = getopt_long(argc, argv, "1bcdfh?pqtvV", long_options, NULL)) != EOF) {
 		switch(c) {
 		case '1':
 			ionce = 1;
@@ -1131,6 +1208,9 @@ int main(int argc, char *argv[])
 		case 'v':
 			verbose = 1;
 			break;
+
+		case 'V':
+			return show_version(NULL);
 		}
 	}
 

src/iwatch.c

@@ -23,6 +23,7 @@
  */
 
 #include <errno.h>
+#include <sys/socket.h>
 
 #include "finit.h"
 #include "iwatch.h"
@@ -39,6 +40,9 @@ static int initialized = 0;
 
 int iwatch_init(struct iwatch *iw)
 {
+	socklen_t len;
+	int sz;
+
 	if (!iw) {
 		errno = EINVAL;
 		return -1;
@@ -51,6 +55,16 @@ int iwatch_init(struct iwatch *iw)
 		_pe("Failed creating inotify descriptor");
 		return -1;
 	}
+
+	/*
+	 * Double the size of the socket's receive buffer to address
+	 * issues with lost events in some cases, e.g. bootstrap and
+	 * reconf of systems with lots of services.
+	 */
+	len = sizeof(sz);
+	if (!getsockopt(iw->fd, SOL_SOCKET, SO_RCVBUF, &sz, &len))
+		setsockopt(iw->fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz));
+
 	initialized = 1;
 
 	return iw->fd;

src/log.c

@@ -59,18 +59,24 @@ void log_exit(void)
 	enable_progress(1);
 }
 
-static void log_open(void)
+static int log_open(void)
 {
-	int opts = LOG_PID;
+	int opts;
+
+	if (up)
+		return 1;
+	if (access("/dev/log", W_OK))
+		return 0;
+
+	opts = LOG_CONS | LOG_PID;
+	if (debug)
+		opts |= LOG_PERROR;
 
 	closelog();
-
-	if (debug)
-		opts |= LOG_PERROR; /* LOG_CONS | */
 	openlog("finit", opts, LOG_DAEMON);
 	setlogmask(LOG_UPTO(loglevel));
 
-	up = 1;
+	return up = 1;
 }
 
 /* Toggle debug mode */
@@ -95,15 +101,12 @@ void log_debug(void)
  */
 void logit(int prio, const char *fmt, ...)
 {
-	FILE *fp;
 	va_list ap;
+	FILE *fp;
 
 	va_start(ap, fmt);
 
-	if (up || fexist("/dev/log")) {
+	if (up || log_open()) {
-		if (!up)
-			log_open();
-
 		vsyslog(prio, fmt, ap);
 		goto done;
 	}
@@ -111,9 +114,9 @@ void logit(int prio, const char *fmt, ...)
 	if (LOG_PRI(prio) > loglevel)
 		goto done;
 
-	fp = fopen("/dev/kmsg", "w");
+	if (in_container() || !(fp = fopen("/dev/kmsg", "w"))) {
-	if (!fp) {
 		vfprintf(stderr, fmt, ap);
+		fputs("\n", stderr);
 		goto done;
 	}
 
@@ -125,6 +128,7 @@ void logit(int prio, const char *fmt, ...)
 		va_end(ap);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
+		fputs("\n", stderr);
 	}
 
 done:

src/log.h

@@ -40,10 +40,10 @@
  * The default log level is LOG_NOTICE.  To toggle LOG_DEBUG messages,
  * use `initctl debug` or add `debug` to the kernel cmdline.
  */
-#define  _d(fmt, args...) logit(LOG_DEBUG,   "%s():" fmt "\n", __func__, ##args)
+#define  _d(fmt, args...) logit(LOG_DEBUG,   "%s():" fmt, __func__, ##args)
-#define  _w(fmt, args...) logit(LOG_WARNING, "%s():" fmt "\n", __func__, ##args)
+#define  _w(fmt, args...) logit(LOG_WARNING, "%s():" fmt, __func__, ##args)
-#define  _e(fmt, args...) logit(LOG_ERR,     "%s():" fmt "\n", __func__, ##args)
+#define  _e(fmt, args...) logit(LOG_ERR,     "%s():" fmt, __func__, ##args)
-#define _pe(fmt, args...) logit(LOG_ERR,     "%s():" fmt ": %s\n", __func__, ##args, strerror(errno))
+#define _pe(fmt, args...) logit(LOG_ERR,     "%s():" fmt ": %n", __func__, ##args, strerror(errno))
 
 void    log_init        (void);
 void    log_exit        (void);

src/reboot.c

@@ -98,11 +98,6 @@ static void do_kill(int signo, char *msg)
 	do_sleep(5);
 }
 
-static void sig(int signo)
-{
-	(void)signo;		/* NOP */
-}
-
 static int usage(int rc)
 {
 	fprintf(stderr, "Usage: %s [OPTIONS]\n\n"
@@ -164,9 +159,6 @@ int reboot_main(int argc, char *argv[])
 	/* Check for any overrides */
 	transform(NULL);
 
-	/* Catch and ignore SIGTERM on halt/poweroff */
-	signal(SIGTERM, sig);
-
 	if (force) {
 		switch (cmd) {
 		case CMD_REBOOT:

src/service.c

@@ -571,6 +571,7 @@ static int service_start(svc_t *svc)
 		} else {
 			i = 0;
 			args[i++] = svc->cmd;
+			args[i++] = svc->cmd;
 			args[i++] = "start";
 		}
 		args[i] = NULL;
@@ -628,10 +629,13 @@ static int service_start(svc_t *svc)
 	switch (svc->type) {
 	case SVC_TYPE_RUN:
 		svc->status = complete(svc->cmd, pid);
-		if (WIFEXITED(svc->status) && !WEXITSTATUS(svc->status))
+		if (WIFEXITED(svc->status) && !WEXITSTATUS(svc->status)) {
+			svc->started = 1;
 			result = 0;
-		else
+		} else {
+			svc->started = 0;
 			result = 1;
+		}
 		svc->start_time = svc->pid = 0;
 		svc->once++;
 		svc_set_state(svc, SVC_STOPPING_STATE);
@@ -701,7 +705,7 @@ static void service_cleanup(svc_t *svc)
 		utmp_set_dead(svc->pid); /* Set DEAD_PROCESS UTMP entry */
 
 	svc->oldpid = svc->pid;
-	svc->start_time = svc->pid = 0;
+	svc->starting = svc->start_time = svc->pid = 0;
 }
 
 /**
@@ -743,8 +747,6 @@ static int service_stop(svc_t *svc)
 	 */
 	svc_started(svc);
 
-	svc_set_state(svc, SVC_STOPPING_STATE);
-
 	if (!svc->desc[0])
 		do_progress = 0;
 
@@ -755,12 +757,17 @@ static int service_stop(svc_t *svc)
 		if (svc->pid > 1) {
 			/* Kill all children in the same proess group, e.g. logit */
 			rc = kill(-svc->pid, svc->sighalt);
-			_d("kill(-%d, %d) => rc %d", svc->pid, svc->sighalt, rc);
+			_d("kill(-%d, %d) => rc %d, errno %d", svc->pid, svc->sighalt, rc, errno);
 			/* PID lost or forking process never really started */
-			if (rc == -1 && ESRCH == errno)
+			if (rc == -1 && (errno == ESRCH || errno == ENOENT)) {
-				service_cleanup(svc);
-		} else
 				service_cleanup(svc);
+				svc_set_state(svc, SVC_HALTED_STATE);
+			} else
+				svc_set_state(svc, SVC_STOPPING_STATE);
+		} else {
+			service_cleanup(svc);
+			svc_set_state(svc, SVC_HALTED_STATE);
+		}
 	} else {
 		char *args[] = { svc->cmd, "stop", NULL };
 		pid_t pid;
@@ -778,7 +785,7 @@ static int service_stop(svc_t *svc)
 			rc = 1;
 			break;
 		default:
-			rc = WEXITSTATUS(complete(svc->cmd, pid));
+			svc_set_state(svc, SVC_STOPPING_STATE);
 			break;
 		}
 	}
@@ -829,7 +836,7 @@ static int service_restart(svc_t *svc)
 	logit(LOG_CONSOLE | LOG_NOTICE, "Restarting %s[%d], sending SIGHUP ...",
 	      svc_ident(svc, NULL, 0), svc->pid);
 	rc = kill(svc->pid, SIGHUP);
-	if (rc == -1 && errno == ESRCH) {
+	if (rc == -1 && (errno == ESRCH || errno == ENOENT)) {
 		/* nobody home, reset internal state machine */
 		lost = svc->pid;
 	} else {
@@ -880,7 +887,7 @@ void service_runlevel(int newlevel)
 	sm_set_runlevel(&sm, newlevel);
 	sm_step(&sm);
 
-	if (!rescue && runlevel <= 1)
+	if (!rescue && (runlevel <= 1 || runlevel == 6))
 		networking(0);
 }
 
@@ -1318,7 +1325,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	}
 
 	/* Decode any optional pid:/optional/path/to/file.pid */
-	if (pid && svc_is_daemon(svc) && pid_file_parse(svc, pid))
+	if (pid && (svc_is_daemon(svc) || svc_is_sysv(svc)) && pid_file_parse(svc, pid))
 		_e("Invalid 'pid' argument to service: %s", pid);
 
 	if (username) {
@@ -1548,6 +1555,34 @@ static void service_kill_script(svc_t *svc)
 	kill(-svc->pid, SIGKILL);
 }
 
+/*
+ * Shared env vars for both pre: and post: scripts
+ */
+static void set_pre_post_envs(svc_t *svc, const char *type)
+{
+	char buf[25 + 256] = "/etc/default:/etc/conf.d";
+	const char *fn = svc_getenv(svc);
+	const char *exist = "0";
+
+	setenv("SERVICE_TYPE", svc_typestr(svc), 1);
+	setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+	setenv("SERVICE_SCRIPT_TYPE", type, 1);
+
+	if (fn) {
+		setenv("SERVICE_ENV_FILE", fn, 1);
+		if (!access(fn, R_OK))
+			exist = "1";
+	}
+	setenv("SERVICE_ENV_FILE", fn, 1);
+	setenv("SERVICE_ENV_FILE_EXIST", exist, 1);
+
+#ifdef FINIT_SYSCONFIG
+	strlcat(buf, ":", sizeof(buf));
+	strlcat(buf, FINIT_SYSCONFIG, sizeof(buf));
+#endif
+	setenv("SERVICE_CONF_DIR", buf, 1);
+}
+
 static void service_pre_script(svc_t *svc)
 {
 	svc->pid = service_fork(svc);
@@ -1564,7 +1599,7 @@ static void service_pre_script(svc_t *svc)
 			NULL
 		};
 
-		setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+		set_pre_post_envs(svc, "pre");
 		execvp(_PATH_BSHELL, argv);
 		_exit(EX_OSERR);
 	}
@@ -1593,7 +1628,7 @@ static void service_post_script(svc_t *svc)
 		rc = WEXITSTATUS(svc->status);
 		sig = WTERMSIG(svc->status);
 
-		setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+		set_pre_post_envs(svc, "post");
 
 		if (WIFEXITED(svc->status)) {
 			char val[4];
@@ -1621,7 +1656,7 @@ static void service_retry(svc_t *svc)
 
 	service_timeout_cancel(svc);
 	if (svc->respawn) {
-		_d("%s crashed, respawning ...", svc->cmd);
+		_d("%s crashed/exited, respawning ...", svc->cmd);
 		svc_unblock(svc);
 		service_step(svc);
 		return;
@@ -1677,6 +1712,27 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
 		service_timeout_cancel(svc);
 		service_timeout_after(svc, svc->killdelay, service_kill);
 	}
+
+	if (svc_is_runtask(svc)) {
+		char success[MAX_COND_LEN], failure[MAX_COND_LEN];
+
+		snprintf(success, sizeof(success), "%s/%s/success", svc_typestr(svc), svc->name);
+		snprintf(failure, sizeof(failure), "%s/%s/failure", svc_typestr(svc), svc->name);
+
+		/* create success/failure condition when entering SVC_DONE_STATE. */
+		if (*state == SVC_DONE_STATE) {
+			if (svc->started)
+				cond_set_oneshot(success);
+			else
+				cond_set_oneshot(failure);
+		}
+
+		/* clear all conditions when entering SVC_HALTED_STATE. */
+		if (*state == SVC_HALTED_STATE) {
+			cond_clear(success);
+			cond_clear(failure);
+		}
+	}
 }
 
 /*
@@ -1719,14 +1775,15 @@ restart:
 
 	case SVC_STOPPING_STATE:
 		if (!svc->pid) {
-			char cond[MAX_COND_LEN];
+			char condstr[MAX_COND_LEN];
 
 			_d("%s: stopped, cleaning up timers and conditions ...", svc->cmd);
 			service_timeout_cancel(svc);
-			cond_clear(mkcond(svc, cond, sizeof(cond)));
+			cond_clear(mkcond(svc, condstr, sizeof(condstr)));
 
 			switch (svc->type) {
 			case SVC_TYPE_SERVICE:
+			case SVC_TYPE_SYSV:
 			case SVC_TYPE_TTY:
 				if (svc_has_post(svc)) {
 					svc_set_state(svc, SVC_CLEANUP_STATE);
@@ -1737,7 +1794,6 @@ restart:
 
 			case SVC_TYPE_TASK:
 			case SVC_TYPE_RUN:
-			case SVC_TYPE_SYSV:
 				svc_set_state(svc, SVC_DONE_STATE);
 				break;
 
@@ -1797,7 +1853,8 @@ restart:
 				 * Restart directly after the first crash,
 				 * then retry after 2 sec
 				 */
-				_d("delayed restart of %s", svc->cmd);
+				if (!svc->respawn)
+					_d("delayed restart of %s", svc->cmd);
 				service_timeout_after(svc, 1, service_retry);
 				break;
 			}
@@ -1813,6 +1870,7 @@ restart:
 				break;
 			}
 		}
+		service_timeout_cancel(svc);
 
 		cond = cond_get_agg(svc->cond);
 		switch (cond) {

src/sig.c

@@ -71,6 +71,7 @@
 
 #include <dirent.h>
 #include <string.h>		/* strerror() */
+#include <sched.h>
 #include <sys/reboot.h>
 #include <sys/wait.h>
 #ifdef _LIBITE_LITE
@@ -172,7 +173,7 @@ void unmount_regular(void);
  *
  * https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
  */
-void do_kill(int signo)
+void do_iterate_proc(int (*cb)(int, void *), void *data)
 {
 	DIR *dirp;
 
@@ -191,6 +192,8 @@ void do_kill(int signo)
 			pid = atoi(d->d_name);
 			if (!pid)
 				continue;
+			if (pid == 1)
+				continue;
 
 			snprintf(file, sizeof(file), "/proc/%s/cmdline", d->d_name);
 			fp = fopen(file, "r");
@@ -203,7 +206,10 @@ void do_kill(int signo)
 				else if (file[0] == '@')
 					_d("Skipping %s ...", &file[1]);
 				else
-					kill(pid, signo);
+					if (cb(pid, data)) {
+						print(0, "PID %d is still alive (%s)", pid, file);
+						break;
+					}
 			}
 			fclose(fp);
 		}
@@ -211,8 +217,61 @@ void do_kill(int signo)
 	}
 }
 
+static int kill_cb(int pid, void *data)
+{
+	int signo = *(int *)data;
+
+	kill(pid, signo);
+
+	return 0;
+}
+
+static int status_cb(int pid, void *data)
+{
+	int *has_proc = (int *)data;
+
+	*has_proc = 1;
+
+	return 1;
+}
+
+/* return value:
+ *  1 - at least one process remaining
+ *  0 - no processes remaining
+ */
+static int do_wait(int secs)
+{
+	const int delay = 250000;
+	int iterations = secs * 1000 * 1000 / delay;
+	int has_proc;
+
+	do {
+		do_usleep(delay);
+		while (waitpid(-1, NULL, WNOHANG) > 0)
+			;
+		has_proc = 0;
+		iterations--;
+		do_iterate_proc(status_cb, &has_proc);
+	}
+	while (has_proc && iterations > 0);
+
+	return has_proc;
+}
+
 void do_shutdown(shutop_t op)
 {
+	struct sched_param sched_param = { .sched_priority = 99 };
+	int in_cont = in_container();
+	int signo = SIGTERM;
+
+	if (!in_cont) {
+		/*
+		 * On a PREEMPT-RT system, Finit must run as the highest prioritized
+		 * RT process to ensure it completes the shutdown sequence.
+		 */
+		sched_setscheduler(1, SCHED_RR, &sched_param);
+	}
+
 	if (sdown)
 		run_interactive(sdown, "Calling shutdown hook: %s", sdown);
 
@@ -223,9 +282,11 @@ void do_shutdown(shutop_t op)
 	 * Tell remaining non-monitored processes to exit, give them
 	 * time to exit gracefully, 2 sec was customary, we go for 1.
 	 */
-	do_kill(SIGTERM);
+	do_iterate_proc(kill_cb, &signo);
-	do_sleep(1);
+	if (do_wait(1)) {
-	do_kill(SIGKILL);
+		signo = SIGKILL;
+		do_iterate_proc(kill_cb, &signo);
+	}
 
 	/* Exit plugins and API gracefully */
 	plugin_exit();
@@ -235,6 +296,12 @@ void do_shutdown(shutop_t op)
 	while (waitpid(-1, NULL, WNOHANG) > 0)
 		;
 
+	if (in_cont) {
+		if (osheading)
+			logit(LOG_CONSOLE | LOG_NOTICE, "%s, shutting down container.", osheading);
+		_exit(0);
+	}
+
 	/* Close all local non-console descriptors */
 	for (int fd = 3; fd < 128; fd++)
 		close(fd);
@@ -255,16 +322,14 @@ void do_shutdown(shutop_t op)
 
 	/* Unmount any tmpfs before unmounting swap ... */
 	unmount_tmpfs();
-	run("swapoff -e -a");
+	if (whichp("swapoff"))
+		run("swapoff -e -a", "swapoff");
 
 	/* ... unmount remaining regular file systems. */
 	unmount_regular();
 
-	/* We sit on / so we must remount it ro, try all the things! */
+	/* We sit on / so we must remount it read-only */
-	sync();
+	run("mount -n -o remount,ro -t none rootfs /", "mount");
-	run("mount -n -o remount,ro -t dummytype dummydev /");
-	run("mount -n -o remount,ro dummydev /");
-	run("mount -n -o remount,ro /");
 
 	/* Call mdadm to mark any RAID array(s) as clean before halting. */
 	mdadm_wait();

src/svc.c

@@ -256,7 +256,7 @@ svc_t *svc_named_iterator(svc_t **iter, int first, char *cmd)
 	for (svc = svc_iterator(iter, first); svc; svc = svc_iterator(iter, 0)) {
 		char *name = svc->name;
 
-		if (!strncmp(name, cmd, strlen(name)))
+		if (string_compare(name, cmd))
 			return svc;
 	}
 
@@ -473,23 +473,23 @@ svc_t *svc_find_by_pidfile(char *fn)
 	pid_t pid;
 
 	pid = pid_file_read(fn);
-	if (pid <= 0) {
+	if (pid > 1) {
-		for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
+		svc = svc_find_by_pid(pid);
-			int v = 0;
+		if (svc)
-
-			if (svc->pidfile[0] == '!')
-				v = 1;
-			if (strcmp(&svc->pidfile[v], fn))
-				continue;
-
 			return svc;
-		}
-
-		return NULL;
 	}
 
+	/*
+	 * No PID in file, or a sysv service.  So it has probably forked
+	 * off a chiled that we don't know about.  See if we can match
+	 * the PID file to a service instead.
+	 */
 	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
-		if (svc->pid != pid)
+		int v = 0;
+
+		if (svc->pidfile[0] == '!')
+			v = 1;
+		if (strcmp(&svc->pidfile[v], fn))
 			continue;
 
 		return svc;
@@ -650,7 +650,7 @@ static char *tokstr(char *str, size_t len)
 /*
  * Used by api.c (to start/stop/restart) and initctl.c (for input validation)
  */
-int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_found)(char *, char *))
+int svc_parse_jobstr(char *str, size_t len, void *user_data, int (*found)(svc_t *, void *), int (not_found)(char *, char *, void *))
 {
 	char *input, *token;
 	int result = 0;
@@ -686,11 +686,11 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
 			if (!ptr) {
 				svc = svc_job_iterator(&iter, 1, job);
 				if (!svc && not_found)
-					result += not_found(NULL, token);
+					result += not_found(NULL, token, user_data);
 
 				while (svc) {
 					if (found)
-						result += found(svc);
+						result += found(svc, user_data);
 					svc = svc_job_iterator(&iter, 0, job);
 				}
 			} else {
@@ -699,19 +699,19 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
 
 				svc = svc_find_by_jobid(job, id);
 				if (!svc && not_found)
-					result += not_found(token, id);
+					result += not_found(token, id, user_data);
 				else if (found)
-					result += found(svc);
+					result += found(svc, user_data);
 			}
 		} else {
 			if (!ptr) {
 				svc = svc_named_iterator(&iter, 1, token);
 				if (!svc && not_found)
-					result += not_found(token, id);
+					result += not_found(token, id, user_data);
 
 				while (svc) {
 					if (found)
-						result += found(svc);
+						result += found(svc, user_data);
 					svc = svc_named_iterator(&iter, 0, token);
 				}
 			} else {
@@ -720,9 +720,9 @@ int svc_parse_jobstr(char *str, size_t len, int (*found)(svc_t *), int (not_foun
 
 				svc = svc_find_by_nameid(token, id);
 				if (!svc && not_found)
-					result += not_found(token, id);
+					result += not_found(token, id, user_data);
 				else if (found)
-					result += found(svc);
+					result += found(svc, user_data);
 			}
 		}
 

src/svc.h

@@ -222,7 +222,7 @@ void	    svc_prune_bootstrap	   (void);
 void        svc_enable             (svc_t *svc);
 int         svc_enabled            (svc_t *svc);
 
-int         svc_parse_jobstr       (char *str, size_t len, int (*found)(svc_t *), int (not_found)(char *, char *));
+int         svc_parse_jobstr       (char *str, size_t len, void *user_data, int (*found)(svc_t *, void *), int (not_found)(char *, char *, void *));
 
 static inline int svc_is_daemon    (svc_t *svc) { return svc && SVC_TYPE_SERVICE == svc->type; }
 static inline int svc_is_sysv      (svc_t *svc) { return svc && SVC_TYPE_SYSV    == svc->type; }
@@ -278,6 +278,31 @@ static inline int svc_has_cond(svc_t *svc)
 	return 0;
 }
 
+static inline const char *svc_typestr(svc_t *svc)
+{
+	switch (svc->type) {
+	case SVC_TYPE_FREE:
+		return "free";
+
+	case SVC_TYPE_SERVICE:
+		return "service";
+
+	case SVC_TYPE_TASK:
+		return "task";
+
+	case SVC_TYPE_RUN:
+		return "run";
+
+	case SVC_TYPE_TTY:
+		return "tty";
+
+	case SVC_TYPE_SYSV:
+		return "sysv";
+	}
+
+	return "unknown";
+}
+
 static inline char *svc_status(svc_t *svc)
 {
 	if (!svc)
@@ -307,7 +332,10 @@ static inline char *svc_status(svc_t *svc)
 		return "unknown";
 
 	case SVC_DONE_STATE:
-		return "done";
+		if (svc->started)
+			return "done";
+		else
+			return "failed";
 
 	case SVC_STOPPING_STATE:
 		switch (svc->type) {

src/util.c

@@ -264,17 +264,39 @@ int strtobytes(char *arg)
 	return bytes;
 }
 
-char *sig2str(int sig)
+char *sig2str(int signo)
 {
 	static char signame[8];
 
-	if (sig < 1 || sig >= (int)NELEMS(signames))
+	if (signo < 1 || signo >= (int)NELEMS(signames))
 		return "";
 
-	snprintf(signame, sizeof(signame), "/%s", signames[sig]);
+	snprintf(signame, sizeof(signame), "/%s", signames[signo]);
 	return signame;
 }
 
+/**
+ * str2sig - Translate signal name to the corresponding signal number.
+ * @sig: The name of the signal
+ *
+ * A signal can be a complete signal name such as "SIGHUP", or
+ * it can be the shortest unique name, such as "HUP" (no SIG prefix).
+ */
+int str2sig(char *sig)
+{
+	size_t i;
+
+	if (!strncasecmp(sig, "SIG", 3))
+		sig += 3;
+
+	for (i = 1; i < NELEMS(signames); ++i) {
+		if (strcasecmp(sig, signames[i]) == 0)
+			return i;
+	}
+
+	return -1;
+}
+
 char *code2str(int code)
 {
 	static char codename[20];
@@ -297,6 +319,20 @@ void do_sleep(unsigned int sec)
 		;
 }
 
+void do_usleep(unsigned int usec)
+{
+	struct timespec deadline;
+
+	clock_gettime(CLOCK_MONOTONIC, &deadline);
+
+	deadline.tv_nsec += usec * 1000;
+	deadline.tv_sec += deadline.tv_nsec / 1000000000;
+	deadline.tv_nsec = deadline.tv_nsec % 1000000000;
+
+	while (clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &deadline, NULL) != 0 && errno == EINTR)
+		;
+}
+
 /* Seconds since boot, from sysinfo() */
 long jiffies(void)
 {

src/util.h

@@ -61,9 +61,11 @@ int   fngetint     (char *path, int *val);
 
 int   strtobytes   (char *arg);
 char *sig2str      (int sig);
+int   str2sig      (char *sig);
 char *code2str     (int code);
 
 void  do_sleep     (unsigned int sec);
+void  do_usleep    (unsigned int usec);
 long  jiffies      (void);
 char *uptime       (long secs, char *buf, size_t len);
 char *memsz        (uint64_t sz, char *buf, size_t len);

test/Makefile.am

@@ -1,12 +1,14 @@
-EXTRA_DIST		 = tenv/lib.sh tenv/exec.sh tenv/start.sh
+SUBDIRS                  = common tenv
-EXTRA_DIST		+= tenv/root.mk tenv/busybox-x86_64.md5
+
-EXTRA_DIST		+= tenv/chrootsetup.sh
+EXTRA_DIST		 = setup-root.sh
-EXTRA_DIST		+= setup-root.sh
-EXTRA_DIST		+= common/service.conf common/service.sh
 EXTRA_DIST		+= add-remove-dynamic-service.sh
 EXTRA_DIST		+= add-remove-dynamic-service-sub-config.sh
 EXTRA_DIST		+= start-stop-service.sh
 EXTRA_DIST		+= start-stop-service-sub-config.sh
+EXTRA_DIST		+= start-kill-service.sh
+EXTRA_DIST		+= start-stop-sysv.sh
+EXTRA_DIST		+= start-stop-serv.sh
+EXTRA_DIST		+= signal-service.sh
 
 AM_TESTS_ENVIRONMENT	 = TENV_ROOT='$(abs_builddir)/tenv-root/';
 AM_TESTS_ENVIRONMENT	+= export TENV_ROOT;
@@ -26,6 +28,10 @@ TESTS			+= add-remove-dynamic-service.sh
 TESTS			+= add-remove-dynamic-service-sub-config.sh
 TESTS			+= start-stop-service.sh
 TESTS			+= start-stop-service-sub-config.sh
+TESTS			+= start-kill-service.sh
+TESTS			+= start-stop-sysv.sh
+TESTS			+= start-stop-serv.sh
+TESTS			+= signal-service.sh
 
 clean-local:
 	-rm -rf $(builddir)/tenv-root/

test/README.md

@@ -1,5 +1,5 @@
-Tests
+Finit Test Suite
-=====
+================
 
 Finit comes with a set of tests and a small framework for running them.
 Contributors are encouraged to write new tests when implementing features, or
@@ -10,10 +10,16 @@ be able to be launched as PID 1. Since it's also running with it's own root
 directory it will be able to function properly without having any super user
 privileges in the host environment.
 
+
 Running tests
 -------------
 
-To run the test suite, first [build](../doc/build.md) Finit - then simply run:
+To run the test suite, first [build](../doc/build.md) Finit, e.g:
+
+    ./configure --prefix=/usr --exec-prefix= --sysconfdir=/etc --localstatedir=/var
+    make -j9 clean all
+
+Then run (parallel does not work atm):
 
     make check
 
@@ -24,3 +30,8 @@ test suite, which is handy when developing new tests or debugging existing
 test. To execute an individual test, simply invoke the script containing it:
 
     ./test/name-of-the-test.sh
+
+Another way to run a single (or more) test(s) is to define the `TESTS`
+environment variable:
+
+    TESTS="start-kill-service" make check

test/add-remove-dynamic-service-sub-config.sh

@@ -7,12 +7,13 @@ TEST_DIR=$(dirname "$0")
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
 
-test_teardown() {
+test_teardown()
-    say "Test done $(date)"
+{
-    say "Running test teardown."
+	say "Test done $(date)"
+	say "Running test teardown."
 
-    texec rm -f "$FINIT_RCSD/service.conf"
+	texec rm -f "$FINIT_RCSD/service.conf"
-    texec rm -f /test_assets/service.sh
+	texec rm -f /test_assets/service.sh
 }
 
 say "Test start $(date)"
@@ -20,7 +21,7 @@ say "Test start $(date)"
 cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
 
 say "Add a dynamic service in $FINIT_RCSD/service.conf"
-texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_RCSD/service.conf"
+texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh -- Dyn serv' > $FINIT_RCSD/service.conf"
 
 say 'Reload Finit'
 texec sh -c "initctl reload"

test/add-remove-dynamic-service.sh

@@ -3,24 +3,31 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")
+export DEBUG=1
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
 
-test_teardown() {
+test_teardown()
-    say "Test done $(date)"
+{
-    say "Running test teardown."
+	say "Test done $(date)"
+	say "Running test teardown."
 
-    texec rm -f "$FINIT_CONF"
+	texec rm -f "$FINIT_CONF"
-    texec rm -f /test_assets/service.sh
+	texec rm -f /test_assets/service.sh
 }
 
+say "Hi, this is /run et al"
+texec sh -c "echo 'ROOT:/bin'; ls -l /bin/; echo 'ROOT:/sbin'; ls -l /sbin/; echo 'ROOT:/run'; ls -l /run/; echo 'ROOT:/run/finit/'; ls -l /run/finit/; echo 'ROOT:/dev'; ls -l /dev/; ps; ls -l /proc/1/fd/"
+say "HUPing PID 1 ..."
+texec sh -c "kill -HUP 1"
+
 say "Test start $(date)"
 
 cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
 
 say "Add a dynamic service in $FINIT_CONF"
-texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
+texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh -- Dyn service' > $FINIT_CONF"
 
 say 'Reload Finit'
 texec sh -c "initctl reload"

test/common/.gitignore

@@ -0,0 +1,5 @@
+/Makefile
+/Makefile.in
+
+/.deps/
+/serv

test/common/Makefile.am

@@ -0,0 +1,4 @@
+EXTRA_DIST	= service.conf service.sh S01-service.sh slay.sh
+
+noinst_PROGRAMS = serv
+serv_SOURCES    = serv.c

test/common/S01-service.sh

@@ -0,0 +1,51 @@
+#!/bin/sh
+# SysV style start script for service.sh
+
+DAEMON="/test_assets/service.sh"
+PIDFILE="/var/run/service.pid"
+
+start()
+{
+	printf 'Starting %s: ' "$DAEMON"
+	start-stop-daemon -S -b -q -p "$PIDFILE" -x "$DAEMON"
+
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+
+	return "$status"
+}
+
+stop()
+{
+	printf 'Stopping %s: ' "$DAEMON"
+	start-stop-daemon -K -q -p "$PIDFILE"
+
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+
+	return "$status"
+}
+
+restart()
+{
+	stop
+	sleep 1
+	start
+}
+
+case "$1" in
+	start|stop|restart)
+		"$1"
+		;;
+	*)
+		echo "Usage: $0 {start|stop|restart}, got $0 $1"
+		exit 1
+esac

test/common/serv.c

@@ -0,0 +1,110 @@
+/*
+ * Basic UNIX daemon
+ *
+ * Options to run in foreground and to create a PID file.  When running
+ * in foregrund it does not create a PID file by default.
+ */
+
+#include <err.h>
+#include <paths.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define PROGNM "serv"
+
+static void sig(int signo)
+{
+	warnx("We got signal %d ...", signo);
+	exit(0);
+}
+
+static void pidfile(char *pidfn)
+{
+	char fn[80];
+	pid_t pid;
+	FILE *fp;
+
+	if (!pidfn) {
+		snprintf(fn, sizeof(fn), "%s%s.pid", _PATH_VARRUN, PROGNM);
+		pidfn = fn;
+	}
+	pid = getpid();
+	warnx("Creating PID file %s with %d", pidfn, pid);
+
+	fp = fopen(pidfn, "w");
+	if (!fp)
+		exit(1);
+	fprintf(fp, "%d\n", pid);
+	fclose(fp);
+}
+
+static int usage(int rc)
+{
+	FILE *fp = rc ? stderr : stdout;
+
+	fprintf(fp,
+		"%s [-nhp] [-P FILE]\n"
+		"\n"
+		" -n       Run in foreground\n"
+		" -h       Show help text (this)\n"
+		" -p       Create PID file despite running in foreground\n"
+		" -P FILE  Create PID file using FILE\n"
+		"\n"
+		"By default this program daemonizes itself to the background, and,\n"
+		"when it's done setting up its signal handler(s), creates a PID file\n"
+		"to let the rest of the system know it's done.  When the program runs\n"
+		"in the foreground it does not create a PID file by default.\n",
+		PROGNM);
+
+	return rc;
+}
+
+int main(int argc, char *argv[])
+{
+	int do_background = 1;
+	int do_pidfile = 1;
+	char *pidfn = NULL;
+	int c;
+
+	while ((c = getopt(argc, argv, "hnpP:")) != EOF) {
+		switch (c) {
+		case 'h':
+			return usage(0);
+		case 'n':
+			do_background = 0;
+			do_pidfile--;
+			break;
+		case 'p':
+			do_pidfile++;
+			break;
+		case 'P':
+			pidfn = optarg;
+			break;
+		default:
+			return usage(1);
+		}
+	}
+
+	/* Daemonize, fork to background etc. */
+	if (do_background) {
+		if (daemon(0, 1))
+			return 1;
+	}
+
+	/* Signal handlers first *then* PID file */
+	signal(SIGTERM, sig);
+
+	/* Tell world where we are, but not if bg w/o pid file */
+	if (do_pidfile == 1)
+		pidfile(pidfn);
+
+	warnx("Entering while(1) loop");
+	while (1)
+		sleep(1);
+
+	warnx("Leaving ...");
+	return 0;
+}

test/common/service.sh

@@ -1,7 +1,24 @@
 #!/bin/sh
 
-set -eu
+cleanup()
+{
+	echo "Got signal, stopping ..."
+	rm -f /run/service.pid
+	exit 0
+}
 
+# Hook SIGUSR1 and dump trace to file system
+# shellcheck disable=SC2172
+trap 'echo USR1 > /tmp/usr1.log' USR1
+trap cleanup INT
+trap cleanup TERM
+trap cleanup QUIT
+trap cleanup EXIT
+
+echo $$ > /run/service.pid
+
+# sleep may exit on known signal, so
+# we cannot use 'set -e'
 while true; do
-  sleep 5
+	sleep 1
 done

test/common/slay.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+nm=$1
+
+# shellcheck disable=SC2046
+getpid()
+{
+	initctl status "$1" |awk '/PID :/{ print $3; }'
+}
+
+pid=$(getpid "$nm")
+if [ -f oldpid ]; then
+	oldpid=$(cat oldpid)
+	if [ "$oldpid" = "$pid" ]; then
+		echo "Looks bad, wait for it ..."
+		sleep 3
+		pid=$(getpid "$nm")
+		if [ "$oldpid" = "$pid" ]; then
+			echo "Finit did not deregister old PID $oldpid vs $pid"
+			initctl status "$nm"
+			ps
+			echo "Reloading finit ..."
+			initctl reload
+			sleep 1
+			initctl status "$nm"
+			exit 1
+		fi
+	fi
+fi
+
+if [ "$pid" -le 1 ]; then
+	sleep 3
+	pid=$(getpid "$nm")
+	if [ "$pid" -le 1 ]; then
+		echo "Got a bad PID: $pid, aborting ..."
+		ps
+		sleep 1
+		initctl status "$nm"
+		ps
+		exit 1
+	fi
+fi
+
+echo "$pid" > oldpid
+
+#echo "PID $pid, kill -9 ..."
+kill -9 "$pid"

test/setup-root.sh

@@ -4,5 +4,21 @@ set -eu
 
 # shellcheck disable=SC2154
 make -C "$top_builddir" DESTDIR="$TENV_ROOT" install
+
 # shellcheck disable=SC2154
 FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$TENV_ROOT" make -f "$srcdir/tenv/root.mk"
+
+# Drop plugins we don't need in test, only causes confusing FAIL in logs.
+for plugin in tty.so urandom.so rtc.so modprobe.so hotplug.so; do
+	find "$TENV_ROOT" -name $plugin -delete
+done
+
+echo "$TENV_ROOT:"
+ls -l "$TENV_ROOT"
+echo "$TENV_ROOT:/bin"
+ls -l "$TENV_ROOT"/bin
+echo "$TENV_ROOT:/sbin"
+ls -l "$TENV_ROOT"/sbin
+echo "$TENV_ROOT:/var"
+ls -l "$TENV_ROOT"/var/
+

test/signal-service.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+# Verifies initctl can send arbitrary signals (USR1 in this case) to finit managed services
+
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+test_teardown()
+{
+	say "Test done $(date)"
+	say "Running test teardown."
+
+	texec rm -f "$FINIT_CONF"
+	texec rm -f /test_assets/service.sh
+}
+
+say "Test start $(date)"
+
+cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
+
+say 'Ensure file system is cleared'
+texec rm -f /tmp/usr1.log
+
+say "Add service stanza in $FINIT_CONF"
+texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh -- Test service' > $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+
+say 'Send SIGUSR1 to service...'
+texec sh -c "initctl signal service.sh SIGUSR1"
+
+# shellcheck disable=SC2016
+retry 'assert "service.sh received SIGUSR" "$(texec cat /tmp/usr1.log)" = "USR1"' 10 1

test/start-kill-service.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+# Verifies Finit restarts crashing services and registers their new PID
+# from their (default) PID file.
+
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+test_teardown()
+{
+	say "Test done $(date)"
+	say "Running test teardown."
+
+	texec rm -f "$FINIT_CONF"
+	texec rm -f /test_assets/service.sh
+}
+
+say "Test start $(date)"
+
+cp "$TEST_DIR"/common/slay.sh    "$TENV_ROOT"/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
+rm -f "$TENV_ROOT"/oldpid
+
+say "Add service stanza in $FINIT_CONF"
+texec sh -c "echo 'service [2345] respawn log /test_assets/service.sh -- Test service' > $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+#texec sh -c "initctl status"
+
+retry 'assert_num_children 1 service.sh'
+texec sh -c "initctl status service.sh"
+
+say 'Simulate service crash (kill -9 ..)'
+i=0
+laps=1000
+while [ $i -lt $laps ]; do
+	i=$((i + 1))
+	say "Lap $i/$laps, killing service ..." # we have this, no sleep needed
+	texec sh -c "/test_assets/slay.sh service.sh"
+done
+
+retry 'assert_new_pid service.sh /run/service.pid'
+retry 'assert_num_children 1 service.sh'

test/start-stop-serv.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+	cp "$TENV_ROOT"/../common/serv "$TENV_ROOT"/test_assets/
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+	say "Running test teardown."
+
+	texec rm -f "$FINIT_CONF"
+	texec rm -f /test_assets/serv
+}
+
+test_one()
+{
+	pidfn=$1
+	service=$2
+
+	say "Add service stanza '$service' to $FINIT_CONF ..."
+	texec sh -c "echo '$service' > $FINIT_CONF"
+
+	say 'Reload Finit'
+	#texec sh -c "initctl debug"
+	texec sh -c "initctl reload"
+	#texec sh -c "initctl status"
+	#texec sh -c "ps"
+
+	#texec sh -c "initctl status"
+	#texec sh -c "ps"
+	#texec sh -c "initctl status serv"
+
+	retry 'assert_num_children 1 serv'
+	retry "assert_pidfile $pidfn" 1
+
+	say 'Stop the service'
+	texec sh -c "initctl stop serv"
+
+	retry 'assert_num_children 0 serv'
+
+	say 'Start the service again'
+	texec sh -c "initctl start serv"
+
+	retry 'assert_num_children 1 serv'
+
+	say "Done, drop service from $FINIT_CONF ..."
+	texec sh -c "rm $FINIT_CONF"
+	texec sh -c "initctl reload"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+test_one "/run/serv.pid"  "service pid:!/run/serv.pid /test_assets/serv -- Forking service"
+# This one could never be started by and monitored by Finit: it forks to
+# background and does not create a PID file.  Essentially it's lost to
+# Finit, and any other sane process monitor.
+#test_one "/run/serv.pid"  "service pid:/run/serv.pid  /test_assets/serv -p -- Forking service w/o PID file"
+test_one "/run/serv.pid"  "service pid:/run/serv.pid  /test_assets/serv -n -- Foreground service w/o PID file"
+test_one "/run/serv.pid"  "service                    /test_assets/serv -n -p -- Foreground service w/ PID file"
+test_one "/run/servy.pid" "service pid:/run/servy.pid /test_assets/serv -n -p -P /run/servy.pid -- Foreground service w/ custom PID file"

test/start-stop-service-sub-config.sh

@@ -7,12 +7,13 @@ TEST_DIR=$(dirname "$0")
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
 
-test_teardown() {
+test_teardown()
-    say "Test done $(date)"
+{
-    say "Running test teardown."
+	say "Test done $(date)"
+	say "Running test teardown."
 
-    texec rm -f "$FINIT_RCSD/service.conf"
+	texec rm -f "$FINIT_RCSD/service.conf"
-    texec rm -f /test_assets/service.sh
+	texec rm -f /test_assets/service.sh
 }
 
 say "Test start $(date)"
@@ -20,7 +21,7 @@ say "Test start $(date)"
 cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
 
 say "Add service stanza in $FINIT_RCSD/service.conf"
-texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_RCSD/service.conf"
+texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh -- Subserv' > $FINIT_RCSD/service.conf"
 
 say 'Reload Finit'
 texec sh -c "initctl reload"

test/start-stop-service.sh

@@ -7,12 +7,13 @@ TEST_DIR=$(dirname "$0")
 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
 
-test_teardown() {
+test_teardown()
-    say "Test done $(date)"
+{
-    say "Running test teardown."
+	say "Test done $(date)"
+	say "Running test teardown."
 
-    texec rm -f "$FINIT_CONF"
+	texec rm -f "$FINIT_CONF"
-    texec rm -f /test_assets/service.sh
+	texec rm -f /test_assets/service.sh
 }
 
 say "Test start $(date)"
@@ -20,7 +21,7 @@ say "Test start $(date)"
 cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/
 
 say "Add service stanza in $FINIT_CONF"
-texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"
+texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh -- Test service' > $FINIT_CONF"
 
 say 'Reload Finit'
 texec sh -c "initctl reload"

test/start-stop-sysv.sh

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+test_teardown() {
+    say "Test done $(date)"
+    say "Running test teardown."
+
+    texec rm -f "$FINIT_CONF"
+    texec rm -f /test_assets/service.sh
+}
+
+say "Test start $(date)"
+
+cp "$TEST_DIR"/common/service.sh     "$TENV_ROOT"/test_assets/
+cp "$TEST_DIR"/common/S01-service.sh "$TENV_ROOT"/test_assets/
+chmod +x "$TENV_ROOT"/test_assets/*.sh
+
+say "Add sysv stanza in $FINIT_CONF"
+texec sh -c "echo 'sysv [2345] pid:!/run/service.pid name:service.sh /test_assets/S01-service.sh -- SysV test service' > $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+
+retry 'assert_num_children 1 service.sh'
+
+say 'Stop the sysv service'
+texec sh -c "initctl stop service.sh"
+
+retry 'assert_num_children 0 service.sh'
+
+say 'Start the sysv service again'
+texec sh -c "initctl start service.sh"
+
+retry 'assert_num_children 1 service.sh'
+
+return 0

test/tenv/.gitignore

@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in

test/tenv/Makefile.am

@@ -0,0 +1,2 @@
+EXTRA_DIST	 = lib.sh exec.sh start.sh root.mk busybox-x86_64.md5
+EXTRA_DIST	+= chrootsetup.sh

test/tenv/chrootsetup.sh

@@ -33,12 +33,12 @@ mount -t proc none /proc
 mount -t sysfs none /sys
 
 if [ "$(ls -A /tmp)" ]; then
-    mkdir -p /tmp.shadow
+	mkdir -p /tmp.shadow
-    mount --bind /tmp /tmp.shadow
+	mount --bind /tmp /tmp.shadow
-    mount -t tmpfs none /tmp
+	mount -t tmpfs none /tmp
-    cp -a /tmp.shadow/* /tmp/
+	cp -a /tmp.shadow/* /tmp/
 else
-    mount -t tmpfs none /tmp
+	mount -t tmpfs none /tmp
 fi
 
 mkdir -p "$FINIT_RCSD"

test/tenv/enter.sh

@@ -4,10 +4,10 @@ set -eu
 
 cmd=""
 if [ "$#" -lt 1 ]; then
-    cmd="/bin/sh"
+	cmd="/bin/sh"
 else
-    cmd=$1
+	cmd=$1
-    shift
+	shift
 fi
 
 TEST_DIR=$(dirname "$0")/..
@@ -15,11 +15,11 @@ TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
 PID_FILE="$TENV_ROOT/running_test.pid"
 
 if [ -f  "$PID_FILE" ] ; then
-    target=$(cat "$PID_FILE")
+	target=$(cat "$PID_FILE")
-    target=$(pgrep -P "$target")
+	target=$(pgrep -P "$target")
 else
-    echo "No test running!"
+	echo "No test running!"
-    exit 1
+	exit 1
 fi
 
 source "$TEST_DIR/test.env"

test/tenv/exec.sh

@@ -24,9 +24,9 @@
 set -eu
 
 if [ "$#" -lt 2 ]; then
-    echo "Usage:"
+	echo "Usage:"
-    echo "  $0 [target-pid] [command [arguments]]"
+	echo "  $0 [target-pid] [command [arguments]]"
-    exit 1
+	exit 1
 fi
 target="$1"
 shift
@@ -45,13 +45,13 @@ export PS4='+ '
 PATH="$TESTENV_PATH"
 export PATH
 
-"$nsenter" \
+"$nsenter"					\
-    --preserve-credentials \
+	--preserve-credentials			\
-    --user \
+	--user					\
-    --mount \
+	--mount					\
-    --uts \
+	--uts					\
-    --ipc \
+	--ipc					\
-    --net \
+	--net					\
-    --pid \
+	--pid					\
-    -w -t "$target" \
+	-w -t "$target"				\
-    "$chroot" "$TENV_ROOT" "$@"
+	"$chroot" "$TENV_ROOT" "$@"

test/tenv/lib.sh

@@ -21,100 +21,124 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-assert_num_children() {
+assert_num_children()
-    assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
+{
+	assert "$1 services are running" "$(texec pgrep -P 1 "$2" | wc -l)" -eq "$1"
 }
 
-texec() {
+# shellcheck disable=SC2086
-    # shellcheck disable=SC2154
+assert_new_pid()
-    "$TEST_DIR/tenv/exec.sh" "$finit_pid" "$@"
+{
+	assert "Finit has registered new PID" "$(texec initctl |grep $1 |awk '{print $1}')" -eq "$(texec cat $2)"
 }
 
-pause() {
+# shellcheck disable=SC2086
-    echo "Press any key to continue... "
+assert_pidfile()
-    read -r REPLY
+{
+	assert "Process has PID file" "$(texec find $1 2>/dev/null)"
 }
 
-toggle_finit_debug() {
+# shellcheck disable=SC2154
-    say 'Toggle finit debug'
+texec()
-    texec initctl debug
+{
-    sleep 0.5
+	"$TEST_DIR/tenv/exec.sh" "$finit_pid" "$@"
+}
+
+pause()
+{
+	echo "Press any key to continue... "
+	read -r REPLY
+}
+
+toggle_finit_debug()
+{
+	say 'Toggle finit debug'
+	texec initctl debug
+	sleep 0.5
 }
 
 color_reset='\e[0m'
 fg_red='\e[1;31m'
 fg_green='\e[1;32m'
 fg_yellow='\e[1;33m'
-log() {
+log()
-    printf "< %s > %b%b%b %s\n" "$0" "$1" "$2" "$color_reset" "$3"
+{
+	test=$(basename "$0" ".sh")
+	printf "\e[2m[%s]\e[0m %b%b%b %s\n" "$test" "$1" "$2" "$color_reset" "$3"
 }
 
-assert() {
+assert()
-    __assert_msg=$1
+{
-    shift
+	__assert_msg=$1
-    if [ ! "$@" ]; then
+	shift
-        log "$fg_red" ✘ "$__assert_msg ($*)"
+
-        return 1
+	if [ ! "$@" ]; then
-    fi
+		log "$fg_red" ✘ "$__assert_msg ($*)"
-    log "$fg_green" ✔ "$__assert_msg"
+		return 1
+	fi
+
+	log "$fg_green" ✔ "$__assert_msg"
 }
 
-retry() {
+retry()
-    __retry_cmd=$1
+{
-    shift
+	__retry_cmd=$1
-    case "$#" in
+	shift
-        2)
-            __retry_n=$1
-            __retry_sleep=$2
-            ;;
-        1)
-            __retry_n=$1
-            __retry_sleep=0.1
-            ;;
-        *)
-            __retry_n=50
-            __retry_sleep=0.1
-            ;;
-    esac
 
-    for _ in $(seq 1 "$__retry_n"); do
+	case "$#" in
-        sleep "$__retry_sleep"
+		2)
-        __retry_cmd_out=$(eval "$__retry_cmd") && \
+			__retry_n=$1
-            echo "$__retry_cmd_out" && \
+			__retry_sleep=$2
-            return 0
+			;;
-    done
+		1)
-    __retry_cmd_exit="$?"
+			__retry_n=$1
-    echo "$__retry_cmd_out"
+			__retry_sleep=0.1
-    return "$__retry_cmd_exit"
+			;;
+		*)
+			__retry_n=50
+			__retry_sleep=0.1
+			;;
+	esac
+	
+	for _ in $(seq 1 "$__retry_n"); do
+		sleep "$__retry_sleep"
+		__retry_cmd_out=$(eval "$__retry_cmd") && \
+			echo "$__retry_cmd_out" && \
+			return 0
+	done
+
+	__retry_cmd_exit="$?"
+	echo "$__retry_cmd_out"
+
+	return "$__retry_cmd_exit"
 }
 
-say() {
+say()
-    log "$fg_yellow" • "$@"
+{
+	log "$fg_yellow" • "$@"
 }
 
-teardown() {
+teardown()
-    test_status="$?"
+{
+	test_status="$?"
 
-    if type test_teardown > /dev/null 2>&1 ; then
+	if type test_teardown > /dev/null 2>&1 ; then
-	test_teardown
+		test_teardown
-    fi
+	fi
 
-    log "$color_reset" '--' ''
+	log "$color_reset" '--' ''
-    if [ "$test_status" -eq 0 ]; then
+	if [ "$test_status" -eq 0 ]; then
-        log "$fg_green" 'TEST PASS' ''
+		log "$fg_green" 'TEST PASS' ''
-    else
+	else
-        log "$fg_red" 'TEST FAIL' ''
+		log "$fg_red" 'TEST FAIL' ''
-    fi
+	fi
-    if [ -n "${finit_pid+x}" ]; then
+	if [ -n "${finit_pid+x}" ]; then
-        texec kill -SIGUSR2 1
+		texec kill -SIGUSR2 1
-    fi
+	fi
 
-    wait
+	wait
 
-    if [ -d "$TENV_ROOT/var/lock" ]; then
+	rm -f "$TENV_ROOT"/running_test.pid
-        chmod +r "$TENV_ROOT/var/lock"
-    fi
-    rm -f "$TENV_ROOT"/running_test.pid
 }
 
 trap teardown EXIT
@@ -127,18 +151,24 @@ export TENV_ROOT
 
 # Setup test environment
 if [ -n "${DEBUG:-}" ]; then
-    FINIT_ARGS="${FINIT_ARGS:-} finit.debug=on"
+	FINIT_ARGS="${FINIT_ARGS:-} finit.debug=on"
 fi
 # shellcheck disable=2086
-"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} &
+"$TEST_DIR/tenv/start.sh" finit ${FINIT_ARGS:-} finit.debug=on &
 finit_ppid=$!
 echo "$finit_ppid" > "$TENV_ROOT"/running_test.pid
 
+>&2 echo "Finit runs as PID $finit_ppid outside of container."
 >&2 echo "Hint: Execute 'TENV_ROOT=$TENV_ROOT $TEST_DIR/tenv/enter.sh' to enter the test namespace"
 log "$color_reset" 'Setup of test environment done' ''
 
 finit_pid=$(retry "pgrep -P $finit_ppid")
 
-tty=/dev/$(texec cat /sys/class/tty/console/active)
+if type test_setup > /dev/null 2>&1 ; then
-texec cat "$tty" &
+	test_setup
-sleep 1
+fi
+
+#tty=/dev/$(texec cat /sys/class/tty/console/active)
+#texec cat "$tty" &
+sleep 5
+

test/tenv/root.mk

@@ -20,51 +20,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-DEST		?= ../tenv-root
+DEST           ?= ../tenv-root
-srcdir		?= ../
+srcdir         ?= ../
 
-ARCH		?= x86_64
+CACHE          ?= ~/.cache
+ARCH           ?= x86_64
 
-FINITBIN   ?= ./sbin/finit
+FINITBIN       ?= ./sbin/finit
 
-BBVER ?= 1.31.0
+BBVER          ?= 1.31.0
-BBBIN  = busybox-$(ARCH)
+BBBIN           = busybox-$(ARCH)
-BBURL ?= https://www.busybox.net/downloads/binaries/$(BBVER)-defconfig-multiarch-musl/$(BBBIN)
+BBURL          ?= https://www.busybox.net/downloads/binaries/$(BBVER)-defconfig-multiarch-musl/$(BBBIN)
 
-binaries = $(DEST)/bin/cat \
+binaries        = $(DEST)/bin/awk		\
-	$(DEST)/bin/cp \
+		$(DEST)/bin/cat			\
-	$(DEST)/bin/date \
+		$(DEST)/bin/cp			\
-	$(DEST)/bin/echo \
+		$(DEST)/bin/date		\
-	$(DEST)/bin/env \
+		$(DEST)/bin/echo		\
-	$(DEST)/bin/find \
+		$(DEST)/bin/env			\
-	$(DEST)/bin/kill \
+		$(DEST)/bin/find		\
-	$(DEST)/bin/ls \
+		$(DEST)/bin/grep		\
-	$(DEST)/bin/mkdir \
+		$(DEST)/bin/kill		\
-	$(DEST)/bin/mkfifo \
+		$(DEST)/bin/ls			\
-	$(DEST)/bin/mknod \
+		$(DEST)/bin/mkdir		\
-	$(DEST)/bin/mount \
+		$(DEST)/bin/mkfifo		\
-	$(DEST)/bin/printf \
+		$(DEST)/bin/mknod		\
-	$(DEST)/bin/pgrep \
+		$(DEST)/bin/mount		\
-	$(DEST)/bin/ps \
+		$(DEST)/bin/printf		\
-	$(DEST)/bin/rm \
+		$(DEST)/bin/pgrep		\
-	$(DEST)/bin/sh \
+		$(DEST)/bin/ps			\
-	$(DEST)/bin/sleep \
+		$(DEST)/bin/rm			\
-	$(DEST)/bin/top \
+		$(DEST)/bin/sh			\
-	$(DEST)/bin/touch
+		$(DEST)/bin/sleep		\
+		$(DEST)/bin/tail		\
+		$(DEST)/bin/top			\
+		$(DEST)/bin/touch		\
+		$(DEST)/bin/start-stop-daemon
 
-dirs = $(DEST)/bin \
+dirs            = $(DEST)/bin			\
-	$(DEST)/dev \
+		$(DEST)/dev			\
-	$(DEST)/etc \
+		$(DEST)/etc			\
-	$(DEST)/proc \
+		$(DEST)/proc			\
-	$(DEST)/sbin \
+		$(DEST)/sbin			\
-	$(DEST)/sys \
+		$(DEST)/var			\
-	$(DEST)/test_assets \
+		$(DEST)/run			\
-	$(DEST)/tmp
+		$(DEST)/sys			\
+		$(DEST)/test_assets		\
+		$(DEST)/tmp
 
-_libs_src = $(shell ldd $(FINITBIN) | grep -Eo '/[^ ]+')
+_libs_src       = $(shell ldd $(FINITBIN) | grep -Eo '/[^ ]+')
-libs = $(foreach path,$(_libs_src),$(abspath $(DEST))$(path))
+libs            = $(foreach path,$(_libs_src),$(abspath $(DEST))$(path))
 
 all: $(dirs) $(binaries) $(libs) $(DEST)/bin/chrootsetup.sh
+	touch $(DEST)/etc/fstab
 
 $(dirs):
 	mkdir -p $@
@@ -72,11 +80,29 @@ $(dirs):
 $(DEST)/bin/$(BBBIN).md5:
 	cp $(srcdir)/tenv/$(notdir $@) $@
 
+.PHONY: $(DEST)/bin/$(BBBIN)
 $(DEST)/bin/$(BBBIN): $(DEST)/bin/$(BBBIN).md5
-	wget -O $@ $(BBURL)
+	@cd $(dir $@)
-	chmod +x $@
+	@if ! md5sum --status -c $(BBBIN).md5 2>/dev/null; then			\
-	cd $(dir $@); \
+		if [ -d $(CACHE) ]; then					\
-	  md5sum -c $(BBBIN).md5
+			echo "Cannot find $(BBBIN), checking $(CACHE) ...";	\
+			cd $(CACHE);						\
+			cp $(DEST)/bin/$(BBBIN).md5 .;				\
+			if ! md5sum --status -c $(BBBIN).md5; then		\
+				echo "No $(BBBIN) available downloading ...";	\
+				wget $(BBURL);					\
+			else							\
+				echo "Found valid $(BBBIN) in cache!";		\
+			fi;							\
+			cp $(BBBIN) $@;						\
+		else								\
+			echo "Cannot find $(BBBIN), downloading ...";		\
+			wget -O $@ $(BBURL);					\
+		fi;								\
+		cd $(dir $@);							\
+		md5sum -c $(BBBIN).md5;						\
+	fi
+	@chmod +x $@
 
 $(DEST)/bin/chrootsetup.sh:
 	cp $(srcdir)/tenv/$(notdir $@) $@

test/tenv/start.sh

@@ -29,6 +29,7 @@ TENV_ROOT="${TENV_ROOT:-$(pwd)/${TEST_DIR}/tenv-root}"
 unshare=$(command -v unshare)
 chroot=$(command -v chroot)
 
+export container="unshare"
 export PS1='\w \$ '
 export PS2='> '
 export PS3='#? '
@@ -39,10 +40,10 @@ export PATH
 
 # Not supported by Busybox unshare:
 #  --cgroup --time
-exec "$unshare" \
+exec "$unshare"						\
-    --user --map-root-user \
+     --user --map-root-user				\
-    --fork --pid --mount-proc \
+     --fork --pid --mount-proc				\
-    --mount \
+     --mount						\
-    --mount-proc \
+     --mount-proc					\
-    --uts --ipc --net \
+     --uts --ipc --net					\
-    "$chroot" "$TENV_ROOT" /bin/chrootsetup.sh "$@"
+     "$chroot" "$TENV_ROOT" /bin/chrootsetup.sh "$@"