Bump version for v4.8 release

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

.github/workflows/coverity.yml

@@ -25,7 +25,7 @@ jobs:
                --post-data "token=$TOKEN&project=${COVERITY_PROJ}&md5=1" \
                -O coverity-latest.tar.gz.md5
           echo "md5=$(cat coverity-latest.tar.gz.md5)" | tee -a $GITHUB_OUTPUT
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: cache
         with:
           path: coverity-latest.tar.gz

ChangeLog.md

@@ -4,6 +4,54 @@ Change Log
 All relevant changes are documented in this file.
 
 
+[4.8][] - 2024-10-13
+--------------------
+
+### Changes
+ - Avoid remounting already mounted `/run` and `/tmp` directories.  This
+   extends the existing support for detecting mounted directories to
+   include complex mount hierarchies are in use, overlayfs and tmpfs
+   mounts.  Feature by Mathias Thore, Atlas Copco
+ - getty: trigger /etc/issue compat mode for Alpine Linux
+ - tmpfiles.d: skip `x11.conf` unless X11 common plugin is enabled
+ - tmpfiles.d: ignore x/X command, nos support for cleanup at runtime
+ - Drop debug mode `-D` from `udevd` in `hotplug.conf.in`, allow the
+   user to set this in `/etc/default/udevd` instead
+ - Certain initctl APIs at bootstrap are not supported, update warning
+   log to include command (number) for troubleshooting, issue #398
+ - Add support for hwrng to urandom plugin and check for empty seed
+ - Add `runparts -b` (batch mode) support, disables escape sequences
+ - New configure `--without-rc-local`, disables `/etc/rc.local` support
+ - New configure `--disable-cgroup` option, disables cgroup v2 detection
+ - `initctl show template@foo.conf` now shows how an enabled template
+   service has been evaluated by Finit, issue #411
+ - Extend `initctl` timeout connecting and waiting for Finit reply.  The
+   previous 2 + 2 second poll timeout has proved to be too short on more
+   complex systems.  Now a 15 + 15 second timeout is applied which should
+   be more resistant to temporary overload scenarios, issue #407
+
+### Fixes
+ - Fix #397: system shutdown/reboot can block on console input if action
+   is started remotely (ssh).  Caused by legact TTY screen size probing,
+   removed from both bootstrap and shutdown/reboot
+ - Fix #400: both `HOOK_MOUNT_ERROR` and `sulogin()` fail to trigger on
+   either mount or `fsck` errors.  Problem caused by unresolved status
+   from pipe, calling `pclose()` without extracting exit status
+ - Fix #402: `initctl touch` does not respect `-n` (no error) flag
+ - Fix #403: `initctl touch` does not support template services
+ - Fix #404: possible undefined behavior when `--with-fstab=no` is set
+ - Fix #405: `@console` getty does not work with `tty0 ttyS0`
+ - Fix #409: prevent tmpfiles from following symlinks for `L+` and `R`,
+   otherwise symlink targets would also be removed.  Found and fixed by
+   Mathias Thore and Ming Liu, Atlas Copco
+ - Fix #414: Frr Zebra immediately restarts on `initctl stop zebra`.
+   The fix likely works for all Frr/Quagga services due to the way they
+   create and delete their pid file
+ - Cosmetic issue with `[ OK ]` messages being printed out of order at
+   shutdown/reboot.  Caused by nested calls to `service_stop()`
+ - Cosmetic issue with duplicate "Restoring RTC" message at bootstrap
+
+
 [4.7][] - 2024-01-07
 --------------------
 
@@ -24,6 +72,7 @@ All relevant changes are documented in this file.
   Found and fixed by Ryan Rorison
 - Fix #389: must libc requires `libgen.h` for `basename()` function.
   Reported and worked around with new `basenm()` function by Stargirl
+- Fix #392: `service/foo/ready` condition reasserted on pidfile removal
 
 
 [4.6][] - 2023-11-13
@@ -1655,7 +1704,8 @@ Major bug fix release.
 
 * Initial release
 
-[UNRELEASED]: https://github.com/troglobit/finit/compare/4.7...HEAD
+[UNRELEASED]: https://github.com/troglobit/finit/compare/4.8...HEAD
+[4.8]: https://github.com/troglobit/finit/compare/4.7...4.8
 [4.7]: https://github.com/troglobit/finit/compare/4.6...4.7
 [4.6]: https://github.com/troglobit/finit/compare/4.5...4.6
 [4.5]: https://github.com/troglobit/finit/compare/4.4...4.5

README.md

@@ -405,8 +405,7 @@ The event loop is the whole thing which Finit is built around, except
 for runlevel S, which remains a slow procession through a lot of set up,
 with a few hooks and blocking call outs to external scripts.
 
-However, not all `initctl` commands are prohibited, supported commands:
+However, not all `initctl` commands are prohibited. Supported commands:
-are:
 
  - `inictl cond`: only operate of files in `/run/finit/cond`
  - `initctl enable/disable`: enabled run/task/service is activated on

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Finit], [4.7], [https://github.com/troglobit/finit/issues],
+AC_INIT([Finit], [4.8], [https://github.com/troglobit/finit/issues],
 	[finit], [https://troglobit.com/projects/finit/])
 AC_CONFIG_AUX_DIR(aux)
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects])
@@ -67,10 +67,18 @@ AC_ARG_ENABLE(fsckfix,
         AS_HELP_STRING([--enable-fsckfix], [Run fsck fix mode (options: -yf) on filesystems listed in /etc/fstab]),,[
 	enable_fsckfix=no])
 
+AC_ARG_ENABLE(cgroup,
+        AS_HELP_STRING([--disable-cgroup], [Disable cgroup v2 support, default: autodetect from /sys/fs/cgroup]),,[
+        enable_cgroup=yes])
+
 AC_ARG_ENABLE(redirect,
         AS_HELP_STRING([--disable-redirect], [Disable redirection of service output to /dev/null]),,[
 	enable_redirect=yes])
 
+AC_ARG_ENABLE(kernel_logging,
+        AS_HELP_STRING([--disable-kernel-logging], [Disable kernel logging to console (use 'quiet' instead!]),,[
+	enable_kernel_logging=yes])
+
 AC_ARG_ENABLE(logrotate,
         AS_HELP_STRING([--disable-logrotate], [Disable built-in rotation of /var/log/wtmp]),,[
 	enable_logrotate=yes])
@@ -181,6 +189,12 @@ AS_IF([test "x$enable_auto_reload" = "xyes"], [
 AS_IF([test "x$enable_kernel_cmdline" = "xyes"], [
         AC_DEFINE(KERNEL_CMDLINE, 1, [Dumpster diving after init args from /proc/cmdline])])
 
+AS_IF([test "x$enable_kernel_logging" = "xyes"], [
+        AC_DEFINE(KERNEL_LOGGING, 1, [Keep kernel warn/err logs to console])])
+
+AS_IF([test "x$enable_cgroup" = "xyes"], [
+        AC_DEFINE(CGROUP2_ENABLED, 1, [Autodetect cgroup v2 support from /sys/fs/cgroup])])
+
 AS_IF([test "x$enable_fastboot" = "xyes"], [
 	AC_DEFINE(FAST_BOOT, 1, [Skip fsck check on filesystems listed in /etc/fstab])])
 
@@ -227,10 +241,9 @@ AC_DEFINE_UNQUOTED(FINIT_RCSD, "$rcsd_path", [Finit rcS.d/, default /etc/finit.d
 AC_SUBST(FINIT_RCSD, "$rcsd_path")
 
 AS_IF([test "x$with_rc_local" != "xno"], [
-	AS_IF([test "x$rclocal" = "xyes"], [
+	AS_IF([test "x$rclocal" = "xyes"], [rclocal=$sysconfdir/rc.local])
-		rclocal=$sysconfdir/rc.local])])
+	AC_EXPAND_DIR(rclocal_path, "$rclocal")
-AC_EXPAND_DIR(rclocal_path, "$rclocal")
+	AC_DEFINE_UNQUOTED(FINIT_RC_LOCAL, "$rclocal_path", [Compat SysV /etc/rc.local file to run last at boot.])])
-AC_DEFINE_UNQUOTED(FINIT_RC_LOCAL, "$rclocal_path", [Compat SysV /etc/rc.local file to run last at boot.])
 
 AS_IF([test "x$with_sysconfig" != "xno"], [
 	AS_IF([test "x$sysconfig" != "xdefault"], [
@@ -355,15 +368,16 @@ cat <<EOF
 
 ------------------ Summary ------------------
  $PACKAGE_NAME version $PACKAGE_VERSION
-  Prefix................: $prefix
+  Prefix................: $(eval echo $prefix)
-  Exec prefix...........: $eprefix
+  Exec prefix...........: $(eval echo $exec_prefix)
+  Libdir................: $(eval echo $libdir)
   Sysconfdir............: `eval echo $sysconfdir`
   Localstatedir.........: `eval echo $localstatedir`
   Default fstab.........: `eval echo $fstab`
   Finit config file.....: $conf_path
   Finit config.d path...: $rcsd_path
   Finit plugin path.....: $plugin_path
-  Compat rc.local path..: $rclocal_path
+  Compat rc.local path..: `eval echo $rclocal`
   System environment....: ${sysconfig_path:-${sysconfig}}
   Random seed path......: $random_path
   C Compiler............: $CC $CFLAGS $CPPFLAGS $LDFLAGS $LIBS
@@ -382,6 +396,9 @@ Optional features:
   Built-in sulogin......: $with_sulogin $sulogin
   Built-in watchdogd....: $with_watchdog $watchdog
   Built-in logrotate....: $enable_logrotate
+  Use cgroup v2.........: $enable_cgroup
+  Parse kernel cmdline..: $enable_kernel_cmdline
+  Keep kernel logging...: $enable_kernel_logging
   Skip fsck check.......: $enable_fastboot
   Run fsck fix mode.....: $enable_fsckfix
   Redirect output.......: $enable_redirect

contrib/alpine/README.md

@@ -1,6 +1,8 @@
 HowTo: Finit on Alpine Linux 3.4...3.19
 =======================================
 
+> **Blog** https://troglobit.com/post/2021-02-12-alpine-linux-with-finit/
+
 HowTo use Finit to boot an [Alpine Linux][] system.  It is assumed that
 the user has already installed make, a compiler, C library header files,
 and other tools needed to build a GNU configure based project.

plugins/pidfile.c

@@ -52,7 +52,7 @@ static int pidfile_add_path(struct iwatch *iw, char *path)
 			ptr = slash++;
 			slash = strchr(ptr, '/');
 			if (slash) {
-				dbg("Path too deep, skipping.");
+				dbg("Path too deep, skipping %s", path);
 				return -1;
 			}
 		}
@@ -66,6 +66,7 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 	char cond[MAX_COND_LEN];
 	char fn[PATH_MAX];
 	svc_t *svc;
+	char *nm;
 
 	paste(fn, sizeof(fn), dir, name);
 	if (fnmatch("*\\.pid", fn, 0) && fnmatch("*/pid", fn, 0))
@@ -79,9 +80,16 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 		return;
 	}
 
-	dbg("Found svc %s for %s with pid %d", svc_ident(svc, NULL, 0), fn, svc->pid);
+	/* Service condistion to set/clear */
 	mkcond(svc, cond, sizeof(cond));
 
+	nm = svc_ident(svc, NULL, 0);
+	dbg("Found svc %s for %s with pid %d", nm, fn, svc->pid);
+	if (svc_is_stopping(svc)) {
+		dbg("Ignoring pidfile death rattles while service %s is %s", nm, svc_status(svc));
+		goto sneaky_zebra;
+	}
+
 	if (mask & (IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) {
 		/*
 		 * only mark native services as started, the s6 and
@@ -125,6 +133,7 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 		if (svc->notify == SVC_NOTIFY_PID || svc->notify == SVC_NOTIFY_NONE)
 			service_ready(svc, 1);
 	} else if (mask & IN_DELETE) {
+	sneaky_zebra:
 		cond_clear(cond);
 		if (svc->notify == SVC_NOTIFY_PID)
 			service_ready(svc, 0);

plugins/rtc.c

@@ -180,7 +180,8 @@ static void rtc_restore(void *arg)
 		rc = 2;
 	}
 
-	print_desc(NULL, "Restoring system clock (UTC) from RTC");
+	if (!rc)
+		print_desc(NULL, "Restoring system clock (UTC) from RTC");
 	tm.tm_isdst = -1; /* Use tzdata to figure it out, please. */
 	tv.tv_sec = mktime(&tm);
 	if (tv.tv_sec == (time_t)-1 || tv.tv_sec < rtc_date_fallback) {

plugins/urandom.c

@@ -42,11 +42,29 @@
 #define RANDOM_BYTES (32*1024)
 #endif
 
+#ifdef RANDOMSEED
+static void fallback(FILE *fp)
+{
+	struct timeval tv;
+	int iter = 128;
+
+	gettimeofday(&tv, NULL);
+	srandom(tv.tv_sec % 3600);
+	while (iter--) {
+		uint32_t i, prng = random();
+
+		for (i = 0; i < sizeof(prng); i++)
+			fputc((prng >> (i * CHAR_BIT)) & UCHAR_MAX, fp);
+	}
+}
+#endif
+
 static void setup(void *arg)
 {
 #ifdef RANDOMSEED
 	struct rand_pool_info *rpi;
 	ssize_t len = 0;
+	struct stat st;
 	int rc = -1;
 	int fd, err;
 
@@ -55,7 +73,7 @@ static void setup(void *arg)
 		return;
 	}
 
-	if (!fexist(RANDOMSEED)) {
+	if (stat(RANDOMSEED, &st) || st.st_size < 512) {
 		int ret = 1;
 		mode_t prev;
 		FILE *fp;
@@ -64,16 +82,22 @@ static void setup(void *arg)
 		prev = umask(077);
 		fp = fopen(RANDOMSEED, "w");
 		if (fp) {
-			int iter = 128;
+			const char *hwrng = "/dev/hwrng";
-			struct timeval tv;
+			FILE *hw;
 
-			gettimeofday(&tv, NULL);
+			hw = fopen(hwrng, "r");
-			srandom(tv.tv_sec % 3600);
+			if (hw) {
-			while (iter--) {
+				char buf[512];
-				uint32_t i, prng = random();
+				size_t len;
 
-				for (i = 0; i < sizeof(prng); i++)
+				len = fread(buf, sizeof(buf[0]), sizeof(buf), hw);
-					fputc((prng >> (i * CHAR_BIT)) & UCHAR_MAX, fp);
+				if (len == 0)
+					fallback(fp);
+				else
+					len = fwrite(buf, sizeof(buf[0]), len, fp);
+				fclose(hw);
+			} else {
+				fallback(fp);
 			}
 			ret = fclose(fp);
 		}

src/api.c

@@ -377,7 +377,9 @@ static void api_cb(uev_t *w, void *arg, int events)
 		case INIT_CMD_POWEROFF:
 		case INIT_CMD_SUSPEND:
 			if (IS_RESERVED_RUNLEVEL(runlevel)) {
-				warnx("Unsupported command in runlevel S and 6/0.");
+				strterm(rq.data, sizeof(rq.data));
+				warnx("Unsupported command (cmd: %d, data: %s) in runlevel S and 6/0.",
+				      rq.cmd, rq.data);
 				goto leave;
 			}
 		default:

src/cgroup.c

@@ -463,6 +463,11 @@ void cgroup_init(uev_ctx_t *ctx)
 	FILE *fp;
 	int fd;
 
+#ifndef CGROUP2_ENABLED
+	avail = 0;
+	return;
+#endif
+
 	if (mount("none", FINIT_CGPATH, "cgroup2", opts, NULL)) {
 		if (errno == ENOENT)
 			logit(LOG_INFO, "Kernel does not support cgroups v2, disabling.");

src/client.c

@@ -29,6 +29,8 @@
 #include "client.h"
 #include "log.h"
 
+#define REQUEST_TIMEOUT 15000
+
 static int sd = -1;
 
 int client_connect(void)
@@ -85,7 +87,7 @@ int client_request(struct init_request *rq, ssize_t len)
 
 	pfd.fd     = sd;
 	pfd.events = POLLOUT;
-	if (poll(&pfd, 1, 2000) <= 0) {
+	if (poll(&pfd, 1, REQUEST_TIMEOUT) <= 0) {
 		warn("Timed out waiting for Finit, errno %d", errno);
 		return -1;
 	}
@@ -107,7 +109,7 @@ int client_request(struct init_request *rq, ssize_t len)
 
 	pfd.fd = sd;
 	pfd.events = POLLIN | POLLERR | POLLHUP;
-	if ((rc = poll(&pfd, 1, 2000)) <= 0) {
+	if ((rc = poll(&pfd, 1, REQUEST_TIMEOUT)) <= 0) {
 		if (rc) {
 			if (errno == EINTR) /* shutdown/reboot */
 				return -1;

src/cond-w.c

@@ -35,6 +35,7 @@
 #include "cond.h"
 #include "pid.h"
 #include "service.h"
+#include "sm.h"
 
 struct cond_boot {
 	TAILQ_ENTRY(cond_boot) link;
@@ -214,7 +215,10 @@ static int do_delete(const char *fpath, const struct stat *sb, int tflag, struct
 		err(1, "Failed removing condition %s", fpath);
 
 	cond = ptr + strlen(COND_BASE) + 1;
-	cond_update(cond);
+	if (sm_is_in_teardown(&sm))
+		cond_clear_noupdate(cond);
+	else
+		cond_update(cond);
 
 	return 0;
 }

src/conf.c

@@ -348,8 +348,11 @@ static void parse_kernel_loglevel(void)
  */
 void conf_parse_cmdline(int argc, char *argv[])
 {
+	const char *ptr;
+
 	/* Set up defaults */
-	fstab      = strdup(FINIT_FSTAB);
+	if ((ptr = FINIT_FSTAB))
+		fstab = strdup(ptr);
 	finit_conf = strdup(FINIT_CONF);
 	finit_rcsd = strdup(FINIT_RCSD);
 	path       = getenv("PATH");

src/exec.c

@@ -138,31 +138,32 @@ int run(char *cmd, char *log)
 
 	pid = fork();
 	if (0 == pid) {
-		int rc = EX_OSERR;
+		char *pfx, buf[256];
+		FILE *pp;
+		int rc;
 
 		setsid();
 		sig_unblock();
 		if (!log) {
 			do_redirect();
 			execvp(args[0], args);
-		} else {
+			_exit(EX_OSERR);
-			char *pfx = *log ? ": " : "";
-			FILE *pp;
-
-			pp = popen(cmd, "r");
-			if (pp) {
-				char buf[256];
-
-				while (fgets(buf, sizeof(buf), pp)) {
-					chomp(buf);
-					logit(LOG_NOTICE, "%s%s%s", log, pfx, buf);
-				}
-
-				rc = pclose(pp);
-			}
 		}
 
-		_exit(rc);
+		pp = popen(cmd, "r");
+		if (!pp)
+			_exit(EX_OSERR);
+
+		pfx = *log ? ": " : "";
+		while (fgets(buf, sizeof(buf), pp)) {
+			chomp(buf);
+			logit(LOG_NOTICE, "%s%s%s", log, pfx, buf);
+		}
+
+		rc = pclose(pp);
+		if (rc == -1)
+			_exit(EX_OSERR);
+		_exit(WEXITSTATUS(rc));
 	} else if (-1 == pid) {
 		err(1, "%s", !log ? args[0] : cmd);
 		if (backup)

src/finit.c

@@ -87,14 +87,22 @@ svc_t *wdog     = NULL;		/* No watchdog by default */
  */
 static void banner(void)
 {
+#ifndef KERNEL_LOGGING
 	/*
 	 * Silence kernel logs, assuming users have sysklogd or
-	 * similar enabled to start emptying /dev/kmsg, but for
+	 * similar enabled to start emptying /dev/kmsg.
-	 * our progress we want to own the console.
+	 *
+	 * Instead of using `configure --disable-kernel-logging`, we
+	 * recommend adjusting the kernel log level in the kernel's
+	 * menuconfig, or using sysctl kernel.printk, or setting the
+	 * desired log level, on the kernel cmdline, e.g. 'quiet'.
+	 *
+	 * By default KERNEL_LOGGING is enabled so you can see any
+	 * warnings/errors or higher on your system console.
 	 */
 	if (!debug && !kerndebug)
 		klogctl(6, NULL, 0);
-
+#endif
 	/*
 	 * First level hooks, if you want to run here, you're
 	 * pretty much on your own.  Nothing's up yet ...
@@ -401,7 +409,7 @@ static void fs_finalize(void)
 	 * To override any of this behavior, add entries to /etc/fstab
 	 * for /run (and optionally /run/lock).
 	 */
-	if (fisdir("/run") && !fismnt("/run")) {
+	if (fisdir("/run") && !fismnt("/run") && !fistmpfs("/run")) {
 		fs_mount("tmpfs", "/run", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME, "mode=0755,size=10%");
 
 		/* This prevents user DoS of /run by filling /run/lock at the expense of another tmpfs, max 5MiB */
@@ -410,7 +418,7 @@ static void fs_finalize(void)
 	}
 
 	/* Modern systems use tmpfs for /tmp */
-	if (!fismnt("/tmp"))
+	if (!fismnt("/tmp") && !fistmpfs("/tmp"))
 		fs_mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV, "mode=1777");
 }
 

src/getty.c

@@ -121,6 +121,9 @@ static int osrel(struct osrel *rel)
 			snprintf(rel->version, sizeof(rel->version), "(%s)", codename);
 	}
 
+	if (rel->id[0] && !strcmp(rel->id, "alpine"))
+		return 1;	/* compat mode for \r et al. */
+
 	return 0;
 }
 

src/helpers.c

@@ -522,9 +522,10 @@ void networking(int updown)
 
 		pid = fork();
 		if (pid == 0) {
-			int rc = EX_OSERR;
 			const char *cmd;
+			char buf[256];
 			FILE *pp;
+			int rc;
 
 			setsid();
 			sig_unblock();
@@ -539,16 +540,16 @@ void networking(int updown)
 				cmd = "ifdown -a -f 2>&1";
 
 			pp = popen(cmd, "r");
-			if (pp) {
+			if (!pp)
-				char buf[256];
+				_exit(EX_OSERR);
 
-				while (fgets(buf, sizeof(buf), pp))
+			while (fgets(buf, sizeof(buf), pp))
-					logit(LOG_NOTICE, "network: %s", chomp(buf));
+				logit(LOG_NOTICE, "network: %s", chomp(buf));
 
-				rc = pclose(pp);
+			rc = pclose(pp);
-			}
+			if (rc == -1)
-
+				_exit(EX_OSERR);
-			_exit(rc);
+			_exit(WEXITSTATUS(rc));
 		}
 		cgroup_service("network", pid, NULL);
 		print(pid > 0 ? 0 : 1, "%s network interfaces ...",

src/log.c

@@ -42,8 +42,6 @@ static int loglevel = LOG_INFO;
 
 void log_init(void)
 {
-	ttinit();
-
 	if (debug)
 		loglevel = LOG_DEBUG;
 	else
@@ -53,13 +51,6 @@ void log_init(void)
 /* If we enabled terse mode at boot, restore to previous setting at shutdown */
 void log_exit(void)
 {
-	/*
-	 * Unless in debug mode at shutdown, Reinitialize screen,
-	 * terminal may have been resized at runtime
-	 */
-	if (!debug)
-		ttinit();
-
 	enable_progress(1);
 }
 

src/runparts.c

@@ -26,18 +26,27 @@
 #else
 #include <sys/prctl.h>
 
+const char *active_msg = NULL;
+int interactive = 1;
 int debug;
 
 static void print_desc(const char *prefix, const char *msg)
 {
-	fprintf(stderr, "\e[1m[\e[0m\e[1;33m ⋯  \e[0m\e[1m]\e[0m %s %s", prefix, msg);
+	if (interactive)
+		fprintf(stderr, "\e[1m[\e[0m\e[1;33m ⋯  \e[0m\e[1m]\e[0m %s %s", prefix, msg);
+	else
+		fprintf(stderr, "%s %s ...\n", prefix, msg);
+	active_msg = msg;
 }
 static void print_result(int rc)
 {
-	if (rc)
+	if (interactive) {
-		fputs("\r\e[1m[\e[0m\e[1;31mFAIL\e[0m\e[1m]\e[0m\n", stderr);
+		if (rc)
-	else
+			fputs("\r\e[1m[\e[0m\e[1;31mFAIL\e[0m\e[1m]\e[0m\n", stderr);
-		fputs("\r\e[1m[\e[0m\e[1;32m OK \e[0m\e[1m]\e[0m\n", stderr);
+		else
+			fputs("\r\e[1m[\e[0m\e[1;32m OK \e[0m\e[1m]\e[0m\n", stderr);
+	} else
+		fprintf(stderr, "[%s]  %s\n", rc ? "FAIL" : " OK ", active_msg ?: "");
 }
 
 void sig_unblock(void)
@@ -193,8 +202,11 @@ int main(int argc, char *argv[])
 	int rc, c, progress = 0, sysv = 0;
 	char *dir;
 
-	while ((c = getopt(argc, argv, "dh?ps")) != EOF) {
+	while ((c = getopt(argc, argv, "bdh?ps")) != EOF) {
 		switch(c) {
+		case 'b':	/* batch mode */
+			interactive = 0;
+			break;
 		case 'd':
 			debug = 1;
 			break;

src/serv.c

@@ -222,20 +222,13 @@ int serv_list(char *arg)
  * If the resulting file doesn't exist, and creat is not set, *or*
  * the base directory doesn't exist, we return NULL.
 .*/
-static char *conf(char *path, size_t len, char *name, int creat)
+static char *conf(char *path, size_t len, char *name, int creat, int template)
 {
-	char corr[40];
-
 	if (!name || !name[0] || !strcmp(name, "finit") || !strcmp(name, "finit.conf")) {
 		strlcpy(path, finit_conf, len);
 		return path;
 	}
 
-	if (!strstr(name, ".conf")) {
-		snprintf(corr, sizeof(corr), "%s.conf", name);
-		name = corr;
-	}
-
 	if (!fisdir(finit_rcsd))
 		return NULL;
 
@@ -243,14 +236,25 @@ static char *conf(char *path, size_t len, char *name, int creat)
 	if (!fisdir(path)) {
 		if (creat && mkdir(path, 0755) && errno != EEXIST)
 			return NULL;
-		else
+		paste(path, len, finit_rcsd, name);
-			paste(path, len, finit_rcsd, name);
 	} else
 		strlcat(path, name, len);
 
+	if (suffix(path, len, ".conf"))
+		return NULL;
+
 	/* fall back to static service unless edit/create */
-	if (!creat && !fexist(path))
+	if (!creat && !fexist(path)) {
-		paste(path, len, finit_rcsd, name);
+		char *at = strchr(path, '@');
+
+		if (template && at)
+			*++at = 0;
+		else
+			paste(path, len, finit_rcsd, name);
+
+		if (suffix(path, len, ".conf"))
+			return NULL;
+	}
 
 	return path;
 }
@@ -336,14 +340,14 @@ int do_disable(char *arg, int check)
 		return serv_list("available");
 	}
 
-	len = strlen(arg);
+	len = strlen(arg) + 7;
-	serv = alloca(len + 6);
+	serv = alloca(len);
 	if (!serv)
 		ERR(71, "failed allocating stack");
 
-	strlcpy(serv, arg, len + 6);
+	strlcpy(serv, arg, len);
-	if (len < 6 || strcmp(&serv[len - 5], ".conf"))
+	if (suffix(serv, len, ".conf"))
-		strlcat(serv, ".conf", len + 6);
+		ERR(71, "failed composing service name (%s)", serv);
 
 	if (chdir(finit_rcsd))
 		ERR(72, "failed cd %s", finit_rcsd);
@@ -374,20 +378,30 @@ int serv_touch(char *arg)
 		return serv_list("enabled");
 	}
 
-	fn = conf(path, sizeof(path), arg, 0);
+	/* 1. Try /etc/finit.d/enabled/$arg.conf to handle template@.conf */
+	paste(path, sizeof(path), finit_rcsd, "enabled/");
+	strlcat(path, arg, sizeof(path));
+	if (!suffix(path, sizeof(path), ".conf") && fexist(path)) {
+		fn = path;
+		goto touchit;
+	}
+
+	/* 2. Try /etc/finit.d/available/$arg.conf and other combos (legacy) */
+	fn = conf(path, sizeof(path), arg, 0, 0);
 	if (!fexist(fn)) {
 		if (!strstr(arg, "finit.conf"))
-			ERRX(72, "%s not available.", arg);
+			ERRX(noerr ? 0 : 72, "%s not available.", arg);
 		if (is_builtin(arg))
-			ERRX(4, "%s is a built-in service.", arg);
+			ERRX(noerr ? 0 : 4, "%s is a built-in service.", arg);
 
 		strlcpy(path, finit_conf, sizeof(path));
 		fn = path;
 	}
 
+touchit:
 	/* libite:touch() follows symlinks */
 	if (utimensat(AT_FDCWD, fn, NULL, AT_SYMLINK_NOFOLLOW))
-		ERR(71, "failed marking %s for reload", fn);
+		ERR(noerr ? 0 : 71, "failed marking %s for reload", fn);
 
 	return 0;
 }
@@ -397,13 +411,18 @@ int serv_show(char *arg)
 	char path[256];
 	char *fn;
 
-	fn = conf(path, sizeof(path), arg, 0);
+	fn = conf(path, sizeof(path), arg, 0, 0);
 	if (!fexist(fn)) {
 		if (is_builtin(arg))
 			ERRX(4, "%s is a built-in service.", arg);
 
-		WARNX("Cannot find %s", arg);
+		fn = conf(path, sizeof(path), arg, 0, 1);
-		return 1;
+		if (!fn || !fexist(fn)) {
+			WARNX("Cannot find %s", arg);
+			return 1;
+		}
+
+		return systemf("cat %s | sed 's/%%i/system/g'", fn);
 	}
 
 	return systemf("cat %s", fn);
@@ -434,7 +453,7 @@ static int do_edit(char *arg, int creat)
 	char path[256];
 	char *fn;
 
-	fn = conf(path, sizeof(path), arg, creat);
+	fn = conf(path, sizeof(path), arg, creat, 0);
 	if (!fexist(fn)) {
 		if (is_builtin(arg))
 			ERRX(4, "%s is a built-in service.", arg);
@@ -488,7 +507,7 @@ int serv_creat(char *arg)
 		return do_edit(arg, 1);
 
 	/* Open fn for writing from pipe */
-	fn = conf(buf, sizeof(buf), arg, 1);
+	fn = conf(buf, sizeof(buf), arg, 1, 0);
 	if (!fn)
 		ERR(73, "failed creating conf %s", arg);
 
@@ -517,7 +536,7 @@ int serv_delete(char *arg)
 		return serv_list("available");
 	}
 
-	fn = conf(buf, sizeof(buf), arg, 0);
+	fn = conf(buf, sizeof(buf), arg, 0, 0);
 	if (!fn) {
 		if (is_builtin(arg))
 			ERRX(4, "%s is a built-in service.", arg);

src/service.c

@@ -1632,11 +1632,18 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	}
 
 	if (type == SVC_TYPE_TTY) {
-		size_t i, len = 0;
+		size_t i, len;
+		char *ptr;
 
 		if (tty_parse_args(&tty, cmd, &args))
 			return errno;
 
+		if (tty_isatcon(tty.dev))
+			dev = tty_atcon();
+		else
+			dev = tty.dev;
+	next:
+		len = 0;
 		if (tty.cmd)
 			len += strlen(tty.cmd);
 		else
@@ -1659,14 +1666,22 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		if (!cmd)
 			return errno;
 
-		if (tty_isatcon(tty.dev))
-			dev = tty_atcon();
-		else
-			dev = tty.dev;
-
 		/* tty's always respawn, never incr. restart_cnt */
 		respawn = 1;
-	next:
+
+		/* Create name:id tuple for identity, e.g., tty:S0 */
+		ptr = strrchr(dev, '/');
+		if (ptr)
+			ptr++;
+		else
+			ptr = dev;
+		if (!strncmp(ptr, "tty", 3))
+			ptr += 3;
+
+		name = "tty";
+		if (!id || id[0] == 0)
+			id = ptr;
+
 		svc = svc_find_by_tty(dev);
 	} else
 		svc = svc_find(name, id);
@@ -1722,8 +1737,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	conf_parse_cond(svc, cond);
 
 	if (type == SVC_TYPE_TTY) {
-		char *ptr;
-
 		if (dev)
 			strlcpy(svc->dev, dev, sizeof(svc->dev));
 		if (tty.baud)
@@ -1738,19 +1751,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 
 		/* TTYs cannot be redirected */
 		log = NULL;
-
-		/* Create name:id tuple for identity, e.g., tty:S0 */
-		ptr = strrchr(svc->dev, '/');
-		if (ptr)
-			ptr++;
-		else
-			ptr = svc->dev;
-		if (!strncmp(ptr, "tty", 3))
-			ptr += 3;
-		if (!id || id[0] == 0)
-			id = ptr;
-		strlcpy(svc->name, "tty", sizeof(svc->name));
-		strlcpy(svc->id, id, sizeof(svc->id));
 	}
 
 	parse_cmdline_args(svc, cmd, &args);
@@ -1870,8 +1870,10 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	/* continue expanding any 'tty @console ...' */
 	if (tty_isatcon(tty.dev)) {
 		dev = tty_atcon();
-		if (dev)
+		if (dev) {
+			id = NULL; /* reset for next tty:ID */
 			goto next;
+		}
 	}
 
 	return 0;
@@ -2261,7 +2263,7 @@ static void svc_set_state(svc_t *svc, svc_state_t new_state)
 	/* if PID isn't collected within SVC_TERM_TIMEOUT msec, kill it! */
 	if (new_state == SVC_STOPPING_STATE) {
 		dbg("%s is stopping, wait %d sec before sending SIGKILL ...",
-		   svc_ident(svc, NULL, 0), svc->killdelay / 1000);
+		    svc_ident(svc, NULL, 0), svc->killdelay / 1000);
 		service_timeout_cancel(svc);
 		service_timeout_after(svc, svc->killdelay, service_kill);
 	}
@@ -2299,6 +2301,8 @@ static void svc_set_state(svc_t *svc, svc_state_t new_state)
 		if ((old_state == SVC_RUNNING_STATE && new_state == SVC_PAUSED_STATE) ||
 		    (old_state == SVC_PAUSED_STATE  && new_state == SVC_RUNNING_STATE))
 			; 	/* only paused during reload, don't clear conds. */
+		else if (sm_is_in_teardown(&sm))
+			cond_clear_noupdate(cond);
 		else
 			cond_clear(cond);
 

src/sm.c

@@ -316,9 +316,11 @@ restart:
 		/* Cleanup stale services */
 		svc_clean_dynamic(service_unregister);
 
+#ifdef FINIT_RC_LOCAL
 		/* Compat SysV init */
 		if (prevlevel == INIT_LEVEL && !rescue)
 			run_bg(FINIT_RC_LOCAL, NULL);
+#endif
 
 		/*
 		 * "I've seen things you people wouldn't believe.  Attack ships on fire off

src/svc.h

@@ -271,6 +271,7 @@ static inline void svc_starting    (svc_t *svc) { if (svc) svc->starting = 1;
 static inline void svc_started     (svc_t *svc) { if (svc) svc->starting = 0;       }
 static inline int  svc_is_starting (svc_t *svc) { return svc && 0 != svc->starting; }
 static inline int  svc_is_running  (svc_t *svc) { return svc && svc->state == SVC_RUNNING_STATE; }
+static inline int  svc_is_stopping (svc_t *svc) { return svc && svc->state == SVC_STOPPING_STATE; }
 
 static inline int  svc_is_removed  (svc_t *svc) { return svc && svc->removed; }
 static inline int  svc_is_changed  (svc_t *svc) { return svc &&  0 != svc->dirty; }

src/tmpfiles.c

@@ -90,7 +90,7 @@ static int rmrf(const char *path)
 	if (!fisdir(path))
 		return 0;
 
-	nftw(path, do_delete, 20, FTW_DEPTH);
+	nftw(path, do_delete, 20, FTW_DEPTH | FTW_PHYS);
 	if (remove(path) && errno != ENOENT)
 		warn("Failed removing path %s", path);
 
@@ -434,6 +434,10 @@ static void tmpfiles(char *line)
 			}
 		}
 		break;
+	case 'X':
+	case 'x':
+		dbg("Unsupported x/X command, ignoring %s, no support for clean at runtime.", path);
+		break;
 	case 'Z':
 		opts = "-R";
 		/* fallthrough */

src/util.c

@@ -42,6 +42,8 @@
 # include <sys/ioctl.h>
 #endif
 #include <sys/sysinfo.h>	/* sysinfo() */
+#include <sys/vfs.h> /* statfs */
+#include <linux/magic.h>
 #ifdef _LIBITE_LITE
 # include <libite/lite.h>
 #else
@@ -572,6 +574,20 @@ int fismnt(char *dir)
 	return ismnt("/proc/mounts", dir, NULL);
 }
 
+/* Return 1 if dir is a backed by tmpfs or overlayfs */
+int fistmpfs(char *dir)
+{
+	struct statfs info = {0};
+
+	if (statfs(dir, &info))
+		return 0;
+
+	if (info.f_type == TMPFS_MAGIC || info.f_type == OVERLAYFS_SUPER_MAGIC)
+		return 1;
+
+	return 0;
+}
+
 #ifdef HAVE_TERMIOS_H
 /*
  * Called by initctl, and by finit at boot and shutdown, to

src/util.h

@@ -80,6 +80,7 @@ void  de_dotdot    (char *file);
 
 int   ismnt        (char *file, char *dir, char *mode);
 int   fismnt       (char *dir);
+int   fistmpfs     (char *dir);
 
 #ifdef HAVE_TERMIOS_H
 int     ttinit     (void);
@@ -109,6 +110,26 @@ static inline int paste(char *buf, size_t len, const char *dir, const char *file
 			fisslashdir(dir) ? "" : file[0] == '/' ? "" : "/", file);
 }
 
+/* ensure path has suffix */
+static inline int suffix(char *path, size_t len, const char *sfx)
+{
+	size_t slen = strlen(sfx);
+	size_t plen = strlen(path);
+
+	if (plen < slen)
+		slen = strlcat(path, sfx, len);
+	else {
+		plen -= slen;
+		if (strcmp(&path[plen], sfx))
+			slen = strlcat(path, sfx, len);
+	}
+
+	if (slen >= len)
+		return -1;
+
+	return 0;
+}
+
 #endif /* FINIT_UTIL_H_ */
 
 /**

system/10-hotplug.conf.in

@@ -18,8 +18,10 @@
 # change the contents any way you like, it can even be empty.
 
 # Check for systemd-udevd and eudev, if we find both, we opt for the latter.
-service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log /lib/systemd/systemd-udevd -- Device event daemon (udev)
+service nowarn cgroup.system name:udevd notify:none env:-/etc/default/udevd pid:udevd log \
-service nowarn [S12345789] cgroup.system name:udevd notify:none pid:udevd log udevd -D -- Device event daemon (udev)
+	[S12345789] /lib/systemd/systemd-udevd $UDEVD_ARGS -- Device event daemon (udev)
+service nowarn cgroup.system name:udevd notify:none env:-/etc/default/udevd pid:udevd log \
+	[S12345789] udevd $UDEVD_ARGS -- Device event daemon (udev)
 
 # Wait for udevd to start, then trigger coldplug events and module loading.
 # The last 'settle' call waits for it to finalize processing all uevents.

test/Makefile.am

@@ -11,7 +11,9 @@ EXTRA_DIST		 = skel/bin/busybox-x86_64.sha256 skel/sbin/service.sh skel/etc/env
 			   skel/cdrom/.empty skel/dev/shm/.empty skel/dev/pts/.empty	     \
 			   skel/etc/inittab skel/etc/hostname skel/etc/fstab 		     \
 			   skel/etc/init.d/rcS skel/etc/init.d/rcK skel/tmp/.empty	     \
-			   skel/etc/finit.d/.empty skel/sbin/task.sh skel/bin/crasher.sh     \
+			   skel/etc/finit.d/.empty skel/etc/finit.d/available/.empty	     \
+			   skel/etc/finit.d/enabled/.empty 				     \
+			   skel/sbin/task.sh skel/bin/crasher.sh			     \
 			   skel/etc/init.d/S01-service.sh skel/etc/init.d/S02-serv.sh	     \
 			   skel/proc/.empty skel/root/.empty skel/run/.empty		     \
 			   skel/sbin/chrootsetup.sh skel/srv/.empty skel/sys/.empty	     \

test/pre-post-serv.sh

@@ -1,4 +1,10 @@
 #!/bin/sh
+#
+# Verify pre:script and post:script runs as intended when starting,
+# stopping and disabling services in various configurations and
+# conditions.
+#
+
 set -eu
 
 TEST_DIR=$(dirname "$0")
@@ -16,6 +22,65 @@ test_teardown()
     run "rm -f $FINIT_CONF"
 }
 
+startit()
+{
+    service=$1
+    conf=$2
+    pre=$3
+    precont=$4
+
+    say "Add stanza '$service' to $conf ..."
+    run "echo '$service' > $conf"
+
+    if echo "$conf" |grep -q available; then
+	# configlets need must be enabled
+	run "initctl enable serv"
+    fi
+
+    say 'Reload Finit'
+    run "initctl reload"
+
+    # Ensure service has started before checking pre condition
+    retry 'assert_num_children 1 serv'
+
+    # Verify pre:script has run
+    if [ -n "$pre" ]; then
+	assert_file_contains "$pre" "$precont"
+	# Drop pre condition indicator for next test
+	run "rm -f $pre"
+    fi
+}
+
+stopit()
+{
+    conf=$1
+    post=$2
+    postcont=$3
+
+    if echo "$conf" |grep -q available; then
+	say 'Disable service & reload'
+	run "initctl disable serv"
+	run "initctl reload"
+    else
+	say 'Stop the service'
+	run "initctl stop serv"
+    fi
+
+    # Ensure service has stopped before checking for post condition
+    retry 'assert_num_children 0 serv'
+
+    # Verify post:script has run
+    if [ -n "$post" ]; then
+	assert_file_contains "$post" "$postcont"
+	# Drop post condition indicator for next test
+	run "rm -f $post"
+    fi
+
+    say "Done, drop $conf ..."
+    run "rm $conf"
+    run "initctl reload"
+}
+
 test_one()
 {
     pre=$1
@@ -23,31 +88,15 @@ test_one()
     service=$3
     post=$4
     postcont=$5
+    avail="$FINIT_RCSD/available/serv.conf"
 
-    say "Add service stanza '$service' to $FINIT_CONF ..."
+    sep "Stage 1/2"
-    run "echo '$service' > $FINIT_CONF"
+    startit "$service" "$FINIT_CONF" "$pre" "$precont"
+    stopit "$FINIT_CONF" "$post" "$postcont"
 
-    say 'Reload Finit'
+    sep "Stage 2/2"
-    run "initctl reload"
+    startit "$service" "$avail" "$pre" "$precont"
-
+    stopit "$avail" "$post" "$postcont"
-    retry 'assert_num_children 1 serv'
-    if [ -n "$pre" ]; then
-	assert_file_contains "$pre" "$precont"
-	run "rm -f $pre"
-    fi
-
-    say 'Stop the service'
-    run "initctl stop serv"
-
-    retry 'assert_num_children 0 serv'
-    if [ -n "$post" ]; then
-	assert_file_contains "$post" "$postcont"
-	run "rm -f $post"
-    fi
-
-    say "Done, drop service from $FINIT_CONF ..."
-    run "rm $FINIT_CONF"
-    run "initctl reload"
 }
 
 # shellcheck source=/dev/null

test/rclocal.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 # Regression test for basic /etc/rc.local functionality
+# shellcheck disable=SC2317
 set -eu
 
 TEST_DIR=$(dirname "$0")

test/run-restart-forever.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # Regression test for issue #351 - verify that a dirty run/task in
-# runlevel S is not restarted forever jus because it exits with a
+# runlevel S is not restarted forever just because it exits with a
 # non-zero error code.
 set -eu
 

tmpfiles.d/Makefile.am

@@ -2,10 +2,14 @@ finitdir              = $(finit_tmpfiles)
 dist_finit_DATA       = finit.conf
 
 tmpfilesdir           = $(tmpfiles_path)
-dist_tmpfiles_DATA    = etc.conf legacy.conf var.conf x11.conf
+dist_tmpfiles_DATA    = etc.conf legacy.conf var.conf
 dist_tmpfiles_DATA   += dnsmasq.conf frr.conf lldpd.conf openswan.conf \
 			quagga.conf sshd.conf uuidd.conf
 
 if BUILD_TESTSERV_PLUGIN
 dist_tmpfiles_DATA   += testserv.conf
 endif
+
+if BUILD_X11_COMMON_PLUGIN
+dist_tmpfiles_DATA   += x11.conf
+endif