Update ChangeLog and bump version for v4.3 release

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Fix links and update with info on new/existing features
2026-10-13 10:14:47 +00:00 · 2022-05-15 21:57:32 +02:00 · 2022-05-15 21:55:38 +02:00 · 2022-05-15 20:45:00 +02:00 · 2022-05-15 11:52:02 +02:00 · 2022-05-15 11:44:24 +02:00
153 changed files with 2528 additions and 848 deletions
@@ -29,11 +29,11 @@ jobs:
          sudo apt-get -y update
          sudo apt-get -y install pkg-config
          wget https://github.com/troglobit/libuev/releases/download/v2.3.2/libuev-2.3.2.tar.xz
-          wget https://github.com/troglobit/libite/releases/download/v2.3.1/libite-2.3.1.tar.gz
+          wget https://github.com/troglobit/libite/releases/download/v2.5.2/libite-2.5.2.tar.gz
          tar xf libuev-2.3.2.tar.xz
-          tar xf libite-2.3.1.tar.gz
+          tar xf libite-2.5.2.tar.gz
          (cd libuev-2.3.2 && ./configure --prefix=/usr && make && sudo make install-strip)
-          (cd libite-2.3.1 && ./configure --prefix=/usr && make && sudo make install-strip)
+          (cd libite-2.5.2 && ./configure --prefix=/usr && make && sudo make install-strip)
          sudo ldconfig
      - uses: actions/checkout@v2
      - name: Static Finit
@@ -3,7 +3,7 @@ name: Release General
 on:
  push:
    tags:
-      - '[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+*'

 jobs:
  release:
@@ -4,20 +4,93 @@ Change Log
 All relevant changes are documented in this file.


-[4.3][UNRELEASED]
+[4.3][] - 2022-05-15
 --------------------

 Critical bug fix release.  If you run a 32-bit target with GLIBC 2.34
 you *need* to upgrade!

+> **Note:** system verbosity on console at start and shutdown has been
+>           increased.  Now the output of all commands is logged to the
+>           system logger, for early services `/dev/kmsg` is used.
+>
+> **Also:** please notice the updated support for enabling and disabling
+>           kernel and Finit debug messages on the system console.  Very
+>           useful when debugging either of them, e.g., a kernel module.
+>           For details, see [cmdline.md](doc/cmdline.md).
+
 ### Changes
+* Support for overriding default runlevel from kernel command line.  Any
+  runlevel `[1-9]` may be selected, except 6 (reboot).  Issue #261
+* New command line option: `finit.fstab=/etc/fstab.custom`, with full
+  support for mounting, mount helpers, fsck, and swapon/off, issue #224
+* Support for special device `/dev/root`, which may not exist in `/dev`.
+  Finit now looks up the matching block device for `/` in `/sys/block/`
 * 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
+* Warning messages in progress output now in yellow, not red, issue #214
+* `initctl`, new command line option `-V,--version` for ease of use
 * 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
+* Conditions for run/task/sysv status, e.g. `run/foo/success` and
+  `task/bar/failure`.  Issue #232, by Ming Liu, Atlas Copco
+* Conditions for services, can be used to synchronize other stanzas:
+  - `service/foo/running`
+  - `service/foo/halted`
+  - `service/foo/missing`
+  - `service/foo/crashed`
+  - `service/foo/stopped`
+  - `service/foo/busy`
+  - `service/foo/restart`
+* `initctl signal` support, by Jörgen Sigvardsson, issue #225
+* `initctl cond get` support to match `cond [set | clear]`, issue #255
+* `[WARN]` messages on console now printed in yellow, issue #214
+* Network services now also stopped when going to runlevel 6 (reboot),
+  not just runlevel 0 (shutdown) or 1 (single-user)
+* When `ifup` is missing on the system, bring at least `lo` up at boot
+* Log output from `ifup -a` (and `ifdown -a`), to syslog
+* Avoid blocking PID 1 when starting SysV init scripts
+* Allow custom `pid:` for SysV init scripts
+* Document supported types of forking/non-forking services
+* Auto-detect running in some common forms of containers
+* Simplify shutdown/reboot when running in a container
+* Log to `stderr` when running in a container w/o syslog daemon
+* Add support for `type:forking` to services, already supported but
+  with a very difficult `pid:` syntax, issue #223.  Docs updated
+* Support for setting global environment variables in `finit.conf`,
+  please note: this also affects Finit itself, be careful!
+* Extended environment variables for pre/post scripts, issue #189
+* Document secret service option `respawn`, which bypasses the crash
+  semantics, allowing endless restarts
+* Document secret `HOOK_BANNER`, the first hook point before the banner
+* Document slightly confusing `initctl reload foo` command.  It does
+  *not* reload the service's `.conf` file!  Issue #263
+* Log changes; all instances where previously the `basename cmd` of a
+  service was used to identify the service, now the proper `name:id` is
+  used instead.  Meaning, a service without a custom `:ID` or `name:`
+  will display the same as before, but with any of those customizations
+  the name and name:id will now be shown.  **Note:** this may affect any
+  log scrapers out there!
+* New plugin: `hook-scripts`, allows [run-parts(8)][] style scripts to
+  run on any hook point.  Contributed by Tobias Waldekranz
+* `initctl` (`reboot`) falls back to `-f` when it detects it is in
+  `sulogin` recovery mode, issue #247
+* The bundled `sulogin` is no longer enabled by default, in favor of
+  distribution versions.  Enable with `./configure --with-sulogin`
+* Support args to sysv-like scripts, e.g. `bridge-stp br0 start`
+* The `modules-load` plugin now skips all lines starting with `#` and
+  `;`.  Furthermore, files in `/etc/modules-load.d/*.conf` are now read
+  in lexicographic order and UNIX backup files (`foo.conf~`) are skipped
+* The `name:id` tuple is now more consistently used in all log and debug
+  messages instead of the basename of the command
+* Simplify error output of `initctl start/stop/restart/signal`, no more
+  extra usage help, just a plain error message
+* Exit codes of `initctl` have changed to use LSB script standard and BSD
+  sysexits.h exit codes.  As before, a non-zero exit is error or missing
+* Add support for `initctl -q` to more commands: stop, start, restart,
+  reload, signal, etc.
+
+[run-parts(8)]: https://manpages.debian.org/cgi-bin/man.cgi?query=run-parts

 ### Fixes
 * Fix nasty 32/64-bit alignment issue between finit and its plugins,
@@ -27,6 +100,22 @@ you *need* to upgrade!
  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
+* Fix #219: not all filesystems unmounted at shutdown, by Ming Liu, 
+  Mathias Thore, and Robert Andersson, Atlas Copco
+* Fix #226: initctl shows wrong PID for crashing services
+* Fix #227: reboot stalls if process stopped with `[WARN]`
+* Fix #233: initctl shows wrong status for run/task, by Sergio Morlans
+  and Ming Liu, Atlas Copco
+* Fix #248: source `env:file` also in `pre:` and `post` scripts
+* Fix #260: drop limit on device name in `Checking filesystem...` output
+* Fix start/stop and monitoring (restart) of SysV init scripts and
+  forking services, see the updated documentation for details
+* Fix call to `swapoff` at shutdown, does not support `-e` flag
+* Fix suspend to RAM issue.  Previously `reboot(RB_SW_SUSPEND)` was
+  used, now the modern `/sys/power/state` API is used instead.
+* Fix nasty run/task/service matcher bug, triggered by stanzas using the
+  same basename of a command but different `:ID`.  Caused Finit to match
+  with already registered but different run/task/service


 [4.2][] - 2022-01-16
@@ -781,7 +870,7 @@ The inetd release.
 ### Changes
 * Add support for built-in inetd super server -- launch services on
  demand.  Supports filtering per interface and custom Inet ports.
-* Upgrade to [libuEv] v1.1.0 to better handle error conditions.
+* Upgrade to [libuEv][] v1.1.0 to better handle error conditions.
 * Allow mixed case config directives in `finit.conf`
 * Add support for RFC 868 (rdate) time plugin, start as inetd service.
 * Load plugins before parsing `finit.conf`, this makes it possible to
@@ -812,7 +901,7 @@ The inetd release.
 [1.11][] - 2015-01-24 [YANKED]
 ------------------------------

-The [libuEv] release.
+The [libuEv][] release.

 **Note:** This release has been *yanked* from distribution due to a
  regression in launching background processes and TTY's.  Fixed in
@@ -1,5 +1,5 @@
 Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
-Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -29,3 +29,5 @@ release: distcheck
 		printf "$$file.md5\t";    cat ../$$file.md5    | cut -f1 -d' ';	\
 		printf "$$file.sha256\t"; cat ../$$file.sha256 | cut -f1 -d' ';	\
 	done
+
+DISTCHECK_CONFIGURE_FLAGS = --with-fstab=/etc/fstab
@@ -45,6 +45,10 @@ Features include:
  * Cgroups v2, both configuration and monitoring in `initctl top`
  * Plugin support for customization
  * Proper rescue mode with bundled `sulogin` for protected maintenance shell
+  * Integration with [watchdogd][] for full system supervision
+  * Logging to kernel ring buffer before `syslogd` has started, see the
+    recommended [sysklogd][] project for complete logging integration
+	and how to log to the kernel ring buffer from scripts using `logger`

 Focus is on small and embedded systems, although Finit is fully usable
 on server and desktop systems as well.  For working examples, see the
@@ -52,7 +56,12 @@ on server and desktop systems as well.  For working examples, see the

  * [Void Linux](contrib/void/),
  * [Alpine Linux](contrib/alpine/), and
-  * [Debian GNU/Linux](contrib/debian/)
+  * [Debian GNU/Linux](contrib/debian/), also works on Ubuntu/Linux Mint
+
+> **Note:** support for various Linux distributions does not mean Finit
+> installs easily on all architectures.  The bundled install scripts are
+> examples for standard installations, tested on amd64 (x86_64) systems.
+> Custom setups, for embedded systems, can be found in [myLinux][].


 Example
@@ -68,7 +77,11 @@ the [initctl](#commands--status) tool.
 host default

 # Runlevel to start after bootstrap, 'S', default: 2
-runlevel 2
+#runlevel 2
+
+# Support for setting global environment variables, using foo=bar syntax
+# be careful though with variables like PATH, SHELL, LOGNAME, etc.
+#PATH=/usr/bin:/bin:/usr/sbin:/sbin

 # Max file size for each log file: 100 kiB, rotate max 4 copies:
 # log => log.1 => log.2.gz => log.3.gz => log.4.gz
@@ -97,6 +110,11 @@ service :8080 [2345] merecat -n -p 8080 /var/www -- Old web server
 #sysv [S] /etc/init.d/acpid                -- Starting ACPI Daemon
 #task [S] /etc/init.d/kbd                  -- Preparing console

+# Hidden from boot progress, using empty `--` description
+#sysv [S] /etc/init.d/keyboard-setup       --
+#sysv [S] /etc/init.d/acpid                --
+#task [S] /etc/init.d/kbd                  --
+
 # Run start scripts from this directory
 # runparts /etc/start.d

@@ -263,8 +281,8 @@ unnecessary overhead, which can be removed at build-time using:

 **Cgroups**

-Finit supports cgroups v2 and comes with the following default groups
-in which services and user sessions are placed in:
+Finit supports cgroups v2 and comes with the following default groups in
+which services and user sessions are placed in:

     /sys/fs/cgroup
       |-- init/               # cpu.weight:100
@@ -300,6 +318,10 @@ The `initctl` tool has three commands to help debug and optimize the
 setup and monitoring of cgroups.  See the `ps`, `top`, and `cgroup`
 commands for details.

+> **Note:** systems that do not support cgroups, specifically version 2,
+> are automatically detected.  On such systems the above functionality
+> is disabled early at boot.
+

 Runparts & /etc/rc.local
 ------------------------
@@ -409,24 +431,24 @@ services, called `initctl`.  Unlike `telinit` the `initctl` tool does
 not return until the given command has fully completed.

 ```
-alpine:~# initctl help
 Usage: initctl [OPTIONS] [COMMAND]

 Options:
  -b, --batch               Batch mode, no screen size probing
  -c, --create              Create missing paths (and files) as needed
  -f, --force               Ignore missing files and arguments, never prompt
+  -h, --help                This help text
  -1, --once                Only one lap in commands like 'top'
  -p, --plain               Use plain table headings, no ctrl chars
  -q, --quiet               Silent, only return status of command
  -t, --no-heading          Skip table headings
  -v, --verbose             Verbose output
-  -h, --help                This help text
+  -V, --version             Show program version

 Commands:
  debug                     Toggle Finit (daemon) debug
  help                      This help text
-  version                   Show Finit version
+  version                   Show program version

  ls | list                 List all .conf in /etc/finit.d
  create   <CONF>           Create   .conf in /etc/finit.d/available
@@ -439,6 +461,7 @@ Commands:
  reload                    Reload  *.conf in /etc/finit.d (activate changes)

  cond     set   <COND>     Set (assert) user-defined condition     +usr/COND
+  cond     get   <COND>     Get status of user-defined condition, see $? and -v
  cond     clear <COND>     Clear (deassert) user-defined condition -usr/COND
  cond     status           Show condition status, default cond command
  cond     dump             Dump all conditions and their status
@@ -446,8 +469,12 @@ Commands:
  log      [NAME]           Show ten last Finit, or NAME, messages from syslog
  start    <NAME>[:ID]      Start service by name, with optional ID
  stop     <NAME>[:ID]      Stop/Pause a running service by name
-  reload   <NAME>[:ID]      Reload service by name (SIGHUP or restart)
+  reload   <NAME>[:ID]      Reload service as if .conf changed (SIGHUP or restart)
+                            This allows restart of run/tasks that have already run
+                            Note: Finit .conf file(s) are *not* reloaded!
  restart  <NAME>[:ID]      Restart (stop/start) service by name
+  signal   <NAME>[:ID] <S>  Send signal S to service by name, with optional ID
+  ident    [NAME]           Show matching identities for NAME, or all
  status   <NAME>[:ID]      Show service status, by name
  status                    Show status of services, default command

@@ -460,6 +487,8 @@ Commands:
  halt                      Halt system
  poweroff                  Halt and power off system
  suspend                   Suspend system
+
+  utmp     show             Raw dump of UTMP/WTMP db
 ```

 For services *not* supporting `SIGHUP` the `<!>` notation in the .conf
@@ -598,6 +627,9 @@ 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
+[myLinux]:          https://github.com/troglobit/myLinux/
+[watchdogd]:        https://github.com/troglobit/watchdogd/
+[sysklogd]:         https://github.com/troglobit/sysklogd/
 [GitHub]:           https://github.com/troglobit/finit/actions/workflows/build.yml/
 [GitHub Status]:    https://github.com/troglobit/finit/actions/workflows/build.yml/badge.svg
 [Coverity Scan]:    https://scan.coverity.com/projects/3545
@@ -1,4 +1,4 @@
-AC_INIT(Finit, 4.3-dev, https://github.com/troglobit/finit/issues, finit, https://troglobit.com/finit.html)
+AC_INIT(Finit, 4.3, 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])
 AM_SILENT_RULES([yes])
@@ -33,8 +33,8 @@ AC_PROG_MKDIR_P

 # Configuration.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fstaby.h termios.h sys/ioctl.h])
-AC_CHECK_FUNCS([strstr getopt getfsenty])
+AC_CHECK_HEADERS([termios.h sys/ioctl.h mntent.h sys/sysmacros.h])
+AC_CHECK_FUNCS([strstr getopt getmntent getmntent_r])

 # Check for uint[8,16,32]_t
 AC_TYPE_UINT8_T
@@ -90,12 +90,17 @@ 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([hook-scripts],  [no],  [Trigger script execution from hook points])
 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
+AC_ARG_WITH(fstab,
+        AS_HELP_STRING([--with-fstab=FILE], [System default fstab, default $sysconfdir/fstab]),
+	[fstab=$withval], [fstab=yes])
+
 AC_ARG_WITH(heading,
        AS_HELP_STRING([--with-heading=GREET], [Heading for boot progress. Default: PRETTY_NAME from /etc/os-release, fallback to "Finit vX.YY"]),
 	[heading=$withval], [heading=yes])
@@ -125,7 +130,7 @@ AC_ARG_WITH(hostname,
 	[hostname=$withval], [hostname=yes])

 AC_ARG_WITH(runlevel,
-        AS_HELP_STRING([--with-runlevel=N], [Runlevel to switch to after bootstrap, default: 2]),
+        AS_HELP_STRING([--with-runlevel=N], [Runlevel to switch to after bootstrap [1-9], default: 2]),
 	[runlevel=$withval], [runlevel=yes])

 AC_ARG_WITH(random-seed,
@@ -135,10 +140,18 @@ AC_ARG_WITH(random-seed,
 AC_ARG_WITH(keventd,
        AS_HELP_STRING([--with-keventd], [Enable built-in keventd, default: no]),, [with_keventd=no])

+AC_ARG_WITH(sulogin,
+        AS_HELP_STRING([--with-sulogin], [Enable built-in sulogin, default: no.]),, [with_sulogin=no])
+
 AC_ARG_WITH(watchdog,
        AS_HELP_STRING([--with-watchdog=[DEV]], [Enable built-in watchdog, default: /dev/watchdog]),
 	[watchdog=$withval], [with_watchdog=no watchdog=])

+AC_ARG_WITH(hook-scripts-path,
+        AS_HELP_STRING([--with-hook-scripts-path=DIR], [Base directory for hook scripts, default $libexecdir/finit/hook]),
+	[hook_scripts_path=$withval], [hook_scripts_path=yes])
+
+
 ### Enable features ###########################################################################

 # Create config.h from selected features and fallback defaults
@@ -164,6 +177,12 @@ AS_IF([test "x$enable_logrotate" != "xno"], [
 AM_CONDITIONAL(LOGROTATE, [test "x$enable_logrotate" = "xyes"])

 ### With features ##############################################################################
+AS_IF([test "x$with_fstab" != "xno"], [
+	AS_IF([test "x$fstab" = "xyes"], [fstab=$sysconfdir/fstab])
+	AC_EXPAND_DIR(fstab_path, "$fstab")
+	AC_DEFINE_UNQUOTED(FINIT_FSTAB, "$fstab_path", [Built-in default: /etc/fstab])],[
+	AC_DEFINE_UNQUOTED(FINIT_FSTAB, NULL, [No built-in default fstab])])
+
 AS_IF([test "x$with_config" != "xno"], [
 	AS_IF([test "x$conf" = "xyes"], [
 		conf=$sysconfdir/finit.conf])])
@@ -218,6 +237,8 @@ AS_IF([test "x$with_random_seed" != "xno"], [

 AS_IF([test "x$with_keventd" != "xno"], [with_keventd=yes])

+AS_IF([test "x$with_sulogin" != "xno"], [with_sulogin=yes])
+
 AS_IF([test "x$with_watchdog" != "xno"], [
 	AS_IF([test "x$watchdog" = "xyes"], [
 		watchdog=/dev/watchdog])
@@ -225,9 +246,15 @@ AS_IF([test "x$with_watchdog" != "xno"], [
        AC_DEFINE_UNQUOTED(WDT_DEVNODE, "$watchdog", [Built-in watchdog device node])], [
 	watchdog=])

+AS_IF([test "x$enable_hook_scripts_plugin" = "xyes" -a "x$with_hook_scripts_path" != "xno"], [
+	AS_IF([test "x$hook_scripts_path" = "xyes"], [hook_scripts_path=$libexecdir/finit/hook])
+	AC_EXPAND_DIR(hook_scripts_path, "$hook_scripts_path")
+	AC_DEFINE_UNQUOTED(PLUGIN_HOOK_SCRIPTS_PATH, "$hook_scripts_path", [Built-in default: $libexecdir/finit])])
+
 # Control build with automake flags
 AM_CONDITIONAL(STATIC,    [test "x$enable_static" = "xyes"])
 AM_CONDITIONAL(KEVENTD,   [test "x$with_keventd"  != "xno"])
+AM_CONDITIONAL(SULOGIN,   [test "x$with_sulogin"  != "xno"])
 AM_CONDITIONAL(WATCHDOGD, [test "x$with_watchdog" != "xno"])
 AM_CONDITIONAL(DOC,       [test "x$enable_doc" = "xyes"])
 AM_CONDITIONAL(CONTRIB,   [test "x$enable_contrib" = "xyes"])
@@ -261,6 +288,7 @@ cat <<EOF
  Exec prefix...........: $eprefix
  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
@@ -278,6 +306,7 @@ Optional features:
  Install doc/..........: $enable_doc
  Install contrib/......: $enable_contrib
  Built-in keventd......: $with_keventd
+  Built-in sulogin......: $with_sulogin
  Built-in watchdogd....: $with_watchdog $watchdog
  Built-in logrotate....: $enable_logrotate
  Skip fsck check.......: $enable_fastboot
@@ -1,6 +1,8 @@
 Bootstrap
 =========

+0. Get bearings, disable kernel logs, initialize TTY and print banner,
+   unless `HOOK_BANNER` is defined, then call that instead
 1. Prepare emergency shell, if enabled
 2. Set up initial signal handlers
 3. Set up default $PATH early
@@ -29,8 +29,8 @@ optional plugins to enable.  It depends on two external libraries:
 The configure script checks for all dependencies, including the correct
 version of the above mentioned libraries.  Currently required versions:

- libite v2.2.0
- libuEv v2.2.0
+- libite v2.2.0, or later
+- libuEv v2.2.0, or later


 Configure
@@ -54,7 +54,7 @@ Below are a few of the main switches to configure:
  will be linked statically.

 * `--enable-kernel-cmdline`: Enable Finit pre-4.1 parsing of init args from
-  `/proc/cmdline`, this is not recommended since Finit may be running as the
+  `/proc/cmdline`, this is *not recommended* since Finit may be running as the
  init for container apps that can see the host's `/proc` filesystem

 * `--enable-alsa-utils-plugin`: Enable the optional `alsa-utils.so` sound plugin.
@@ -65,8 +65,19 @@ Below are a few of the main switches to configure:

 * `--enable-x11-common-plugin`: Enable the optional X Window `x11-common.so` plugin.

+* `--with-sulgin`: Enable bundled `sulogin` program.  Default is to use the
+  system `sulogin(8)`.  The sulogin shipped with Finit *allows password-less*
+  login if the `root` user is disabled or has no password at all.
+
 For more configure flags, see <kbd>./configure --help</kbd>

+> **Note:** the configure script is not available in the GIT sources.  It is
+>           however included in (officially supported) released tarballs.  The
+>           idea is that you should not need GNU autotools to build, only the
+>           above mentioned dependencies, a POSIX shell, a C compiler and make.
+>           Any contributing to Finit can generate it from `configure.ac` using
+>           the `autogen.sh` script.
+

 Example
 -------
@@ -74,8 +85,8 @@ Example
 First, unpack the archive:

 ```shell
-$ tar xf finit-4.1.tar.gz
-$ cd finit-4.1/
+$ tar xf finit-4.3.tar.gz
+$ cd finit-4.3/
 ```

 Then configure, build and install:
@@ -83,7 +94,7 @@ Then configure, build and install:
 ```shell
 $ ./configure --prefix=/usr                 --exec-prefix=         \
              --sysconfdir=/etc             --localstatedir=/var   \
-			  --with-keventd                --with-watchdog
+              --with-keventd                --with-watchdog
 $ make
 .
 .
@@ -91,7 +102,7 @@ $ make
 $ DESTDIR=/tmp/finit make install
 ```

-In this example the [finit-4.1.tar.gz][1] archive is unpacked to the
+In this example the [finit-4.3.tar.gz][1] archive is unpacked to the
 user's home directory, configured, built and installed to a temporary
 staging directory.  The environment variable `DESTDIR` controls the
 destination directory when installing, very useful for building binary
@@ -146,17 +157,22 @@ enabled.  The default Finit rescue mode configuration is installed into

 By default the a root shell, without login, is started.

+> **Note:** in this mode `initctl` will not work.  Use the `-f` flag to
+> force `reboot`, `shutdown`, or `poweroff`.
+

 Debugging
 ---------

 Edit, or append to, the kernel command line: remove `quiet` to enable
-kernel messages and add `debug` to enable Finit debug messages.
+kernel messages and add `finit.debug` to enable Finit debug messages.

 ```shell
-append="init=/sbin/finit debug"
+append="init=/sbin/finit -- finit.debug"
 ```

+Notice the `--` separator.
+
 To debug startup issues, in particular issues with getty/login, add
 the following to your Finit .conf file:

@@ -175,6 +191,6 @@ it only for debugging start up issues when Finit crashes.
         systems since they can potentially give a user root access.


-[1]:       ftp://troglobit.com/finit/finit-4.1.tar.gz
+[1]:       ftp://troglobit.com/finit/finit-4.3.tar.gz
 [libuEv]:  https://github.com/troglobit/libuev
 [libite]:  https://github.com/troglobit/libite
@@ -10,13 +10,32 @@ The `bool` setting is one of `on, off, true false, 1, 0`.
 > parameters to init.  E.g., `init=/sbin/finit -- finit.debug rescue`

 * `debug`: Enable kernel debug.  Debug messages are printed to the
-    console until Finit starts up.
+   console until Finit starts up, unless `loglevel=7` (below) is used.

 * `finit.debug[=bool]`: Enable finit debug.  This is operated
-	independently of the kernel debug setting.  New as of Finit v4.
+	independently of the kernel `debug` setting.  New as of Finit v4.

-* `finit.show_status[=bool]`: Control finit boot progress, including
-  banner.
+* `finit.fstab=</path/to/etc/fstab.alternative>`: Tell Finit to use an
+  alternate `fstab` to mount the file system from.  Remember, this file
+  must be on the `root=...` file system provided to Finit from the
+  kernel.  By default the built-in fstab is used, which itself defaults
+  to `/etc/fstab`, but can be changed at build time with:
+
+        ./configure --with-fstab=/path/to/fstab
+
+  It is even possible to disable a built-in default using:
+
+        ./configure --without-fstab
+
+  Making `finit.fstab=/path/to/fstab` a *mandatory* command line option.
+  Note, if the command line fstab is missing, Finit falls back to the
+  built-in fstab, and if both are missing, the system treats this as a
+  bad `fsck` and thus calls `sulogin`.  If, in turn, `sulogin` is not
+  available on the system, Finit calls reboot, which is also what will
+  happen when a user exits from `sulogin`.
+
+* `finit.status[=bool]`: Control finit boot progress, including banner.
+  (Used to be `finit.show_status`, which works but is deprecated.)

 * `finit.status_style=<classic,modern>`: Set Finit boot progress style,
  when enabled.
@@ -26,25 +45,41 @@ The `bool` setting is one of `on, off, true false, 1, 0`.
 	signals and has no job control.  Recommend using, and modifying,
 	`rescue` mode instead.

+* `loglevel=<0-7>`, sets the kernel's log level, which is more granular
+  than `debug`.  Also, when `loglevel=7`, Finit will *not disable*
+  kernel logs to the console.  This is very useful when debugging the
+  kernel at system bring-up.  Since `loglevel=7` is the same as `debug`
+  this means you have to use `quiet` for a quiet boot, until sysklogd
+  takes over logging of kernel events.
+
 * `panic=SEC`: By default the kernel does not reboot after a kernel
    panic.  This setting will cause a kernel reboot after SEC seconds.

 * `quiet`: Suppress kernel logging to console, except for warnings and
-  errors.
+  errors.  Also, see `loglevel` and `quiet` above.

 * `rescue`: Start rescue/maintenance mode.  If your system comes with
    the bundled `sulogin` program (Finit, or from util-linux/Busybox),
    you will be given a root login to a maintenance shell.  However, if
    `sulogin` is missing, the file `/lib/finit/rescue.conf` is read and
    the system booted in a limited fallback mode.  See [config.md][]
-	for more information.
+    for more information.
+
+    **Note:** in this mode `initctl` will not work.  Correct the problem
+    and use `reboot -f` to force reboot.

 * `single`, or `S`: Single user mode, runlevel 1, in Finit.  Useful to
    debug problems with the regular runlevel.  All services and TTYs in
    `[1]` will be started, so a `tty [1] @console nologin` configuration
    presents you with a root console without login.

+ * `1-9`, except `6`: override the configured `runlevel`.  Like the `S`
+   and `rescue`, giving a single number on the kernel command line tells
+   Finit to ignore any `runlevel` in `/etc/finit.conf` as well as the
+   configure fallback `--with-runlevel=N` setting.  Remember, `6` is the
+   reboot runlevel and is not permitted.  Any other values are ignored.
+
 For more on kernel boot parameters, see the man page [bootparam(7)][].

-[config.md][]:  config.md#rescue-mode
+[config.md]:    config.md#rescue-mode
 [bootparam(7)]: https://www.man7.org/linux/man-pages/man7/bootparam.7.html
@@ -73,6 +73,36 @@ document [Finit Services](service.md).
 > examples in the `contrib/` directory, which can be used as a base.


+### Environment Variables
+
+In Finit v4.3 support for setting environment variables in `finit.conf`,
+and any `*.conf`, was added.  It is worth noting that these are global
+and *shared with all* services -- the only way to have service-local
+environment is detailed in the next section.
+
+The syntax for global environment variables is straight forward:
+
+    foo=bar
+    baz="qux"
+
+On reload of .conf files, all tracked environment variables are cleared
+so if `foo=bar` is removed from `finit.conf`, or any `finit.d/*.conf`
+file, it will no longer be used by Finit or any new (!) started
+run/tasks or services.  The environment of already started processes can
+not be changed.
+
+The only variables reset to sane defaults on .conf reload are:
+
+    PATH=_PATH_STDPATH
+    SHELL=_PATH_BSHELL
+    LOGNAME=root
+    USER=root
+
+It is entirely possible to override these as well from the .conf files,
+but be careful.  Changing SHELL changes the behavior of `system()` and a
+lot of other commands as well.
+
+
 Service Environment
 -------------------

@@ -323,6 +353,10 @@ calls `init-script restart` on `initctl reload`.  Similar to how

 Forking services started with `sysv` scripts can be monitored by Finit
 by declaring the PID file to look for: `pid:!/path/to/pidfile.pid`.
+Notice the leading `!`, it signifies Finit should not try to create the
+file, but rather watch that file for the resulting forked-off PID.  This
+syntax also works for forking daemons that do not have a command line
+option to run it in the foreground, more on this below in `service`.

 > `<COND>` is described in the [Services](#services) section.

@@ -337,6 +371,8 @@ default 10 times before giving up and marking them as *crashed*.
 After which they have to be manually restarted with `initctl restart
 NAME`.  The limits controling this are configurable, see the options
 below.
+
+> **Tip:** to allow endless restarts, see below option `respawn`
  
 For daemons that support it, we recommend appending `--foreground`,
 `--no-background`, `-n`, `-F`, or similar command line argument to
@@ -344,9 +380,19 @@ prevent them from forking off a sub-process in the background.  This is
 the most reliable way to monitor a service.

 However, not all daemons support running in the foreground, or they may
-start logging to the foreground as well, these are called forking
-services and are supported using the same syntax as forking `sysv`
-services, using the `pid:!/path/to/pidfile.pid` syntax.
+start logging to the foreground as well, these are forking daemons and
+are supported using the same syntax as forking `sysv` services, using
+the `pid:!/path/to/pidfile.pid` syntax.  There is an alternative syntax
+that may be more intuitive, where Finit can also guess the PID file
+based on the daemon's command name:
+
+    service type:forking ntpd -- NTP daemon
+
+This example lets BusyBox `ntpd` daemonize itself.  Finit uses the
+basename of the binary to guess the PID file to watch for the PID:
+`/var/run/ntpd.pid`.  If Finit guesses wrong, you have to submit the
+full `pid:!/path/to/file.pid`.
+
  
 **Example:**

@@ -397,13 +443,17 @@ As mentioned previously, services are automatically restarted, this is
 configurable with the following options:

  * `restart:NUM` -- number of times Finit tries to restart a crashing
-    service, default: 10.  When this limit is reached the service is
-	marked *crashed* and must be restarted manually with `initctl`
+    service, default: 10, max: 255.  When this limit is reached the
+    service is marked *crashed* and must be restarted manually with
+    `initctl restart NAME`
  * `restart_sec:SEC` -- number of seconds before Finit tries to restart
    a crashing service, default: 2 seconds for the first five retries,
 	then back-off to 5 seconds.  The maximum of this configured value
 	and the above (2 and 5) will be used
  * `norestart` -- dont restart on failures, same as `restart:0`
+  * `respawn` -- bypasses the `restart` mechanism completely, allows
+    endless restarts.  Useful in many use-cases, but not what `service`
+    was originally designed for so not the default behavior
  * `oncrash:reboot` -- when all retries have failed, and the service
    has *crashed*, if this option is set the system is rebooted.
    Note, future releases may include other `oncrash:` actions
@@ -625,6 +675,9 @@ activate it.

 The rescue mode comes in two flavors; *traditional* and *fallback*.

+> **Note:** in this mode `initctl` will not work.  Use the `-f` flag to
+> force `reboot`, `shutdown`, or `poweroff`.
+

 ### Traditional

@@ -34,26 +34,50 @@ For your convenience a set of *optional* plugins are available:
 * *dbus.so*: Setup and start system message bus, D-Bus, at boot.
  _Optional plugin._

+* *hook-scripts.so*: Trigger the execution of scripts from plugin hook
+  points (see [Hooks](#hooks)).  Scripts are located in
+  `/libexec/finit/hook` by default, this can be build-time customized
+  by using the `--with-hook-scripts-path=PATH` argument to
+  `configure`.  _Optional plugin._
+
 * *hotplug.so*: Setup and start either udev or mdev hotplug daemon, if
-  available.
+  available.  Enabled by default.

 * *rtc.so*: Restore and save system clock from/to RTC on boot/halt.
+  Enabled by default.

-* *modules-load.so*: Scans /etc/modules-load.d for modules to modprobe.
+* *modules-load.so*: Scans `/etc/modules-load.d/*.conf` for modules to
+  load using `modprobe`.  Each file can contain multiple lines with the
+  name of the module to load.  Any line starting with the standard UNIX
+  comment character, `#`, is skipped.
+  
+  Modules are loaded when entering runlevel `[2345]` using the `task`
+  stanza.  Each module gets a unique `name:modprobe.foo`, and
+  optional`:ID`.  The `:ID` is a globally incremented index, which can
+  be disabled per file (anywhere) using the following config line:
+
+        set noindex
+
+  **Note:** unlike the traditional .conf `module` directive, which load
+  any listed module immediately, this plugin creates standard `taks`
+  directives which load the module(s) in the background.  As long as
+  the `modprobe` program is found in the path, these tasks will always
+  return `[ OK ]` at boot.  Check the actual status using `initctl`.

 * *netlink.so*: Listens to Linux kernel Netlink events for gateway and
  interfaces.  These events are then sent to the Finit service monitor
  for services that may want to be SIGHUP'ed on new default route or
-  interfaces going up/down.
+  interfaces going up/down.  Enabled by default.

 * *resolvconf.so*: Setup necessary files for `resolvconf` at startup.
  _Optional plugin._

 * *tty.so*: Watches `/dev`, using inotify, for new device nodes (TTY's)
  to start/stop getty consoles on them on demand.  Useful when plugging
-  in a usb2serial converter to login to your embedded device.
+  in a usb2serial converter to login to your embedded device.  Enabled
+  by default.

-* *urandom.so*: Setup random seed at startup.
+* *urandom.so*: Setup random seed at startup.  Enabled by default.

 * *x11-common.so*: Setup necessary files for X-Window.  _Optional plugin._

@@ -69,6 +93,11 @@ Hooks

 ### Bootstrap Hooks

+* `HOOK_BANNER`: The very first point at which a plugin can run.
+  Intended to be used as a banner replacement.  Essentially this runs
+  just before entering runlevel S.  Assume nothing is available, so
+  be prepared to use absolute paths, etc.
+
 * `HOOK_ROOTFS_UP`: When `finit.conf` has been read and `/` has is
  mounted — very early

@@ -27,7 +27,17 @@ Finit can *not* start and monitor a daemon that:

 ### Forks to Background w/ PID File

-    service pid:!/run/serv.pid serv       -- Forking service
+There are two syntax variants, type 1 and type 2.  The former is the
+traditional one used also for `sysv` start/stop scripts, and the latter
+is inspired by systemd, with a twist -- it lets Finit guess the pifdile
+to look for based on the standard path and the basename of the command.
+
+    service pid:!/run/serv.pid serv       -- Forking service, type 1
+    service type:forking       serv       -- Forking service, type 2
+
+In this example the resulting files to watch for are `/run/serv.pid` and
+`/var/run/serv.pid`, respectively.  On most modern Linux systems this is
+the same directory (`/var/run` is a symlink to `../run`).

 ### Runs in Foreground w/ PID File

@@ -11,9 +11,11 @@
 .Nd Fast init for Linux systems
 .Sh SYNOPSIS
 .Nm /sbin/finit
-.Op finit.status_style=classic
-.Op finit.show_status=[on,off]
+.Op --
 .Op finit.debug
+.Op finit.fstab=/etc/fstab.alt
+.Op finit.status=<on,off>
+.Op finit.status_style=<classic,modern>
 .Op rescue | recover
 .Op single | S
 .Nm /sbin/telinit
@@ -61,12 +63,93 @@ Plugin support for customization
 .It
 Proper rescue mode with bundled `sulogin` for protected maintenance shell
 .El
+.Sh BOOTPARAM
+.Nm
+support the following command line parameters to alter the behavior
+at boot.  Notice the
+.Cm --
+separator needed to tell the kernel which paramters should be given to
+PID 1.  For more information on this, and available kernel command line
+options, see
+.Xr bootparam 7 .
+.Bl -tag -width pid -offset indent
+.It Cm finit.debug
+Enable Finit debug messages on system console and log.  Sometimes useful
+when doing board bringup.  Before the system log daemon has started,
+Finit use the kernel ring buffer,
+.Pa /dev/kmsg .
+.It Cm finit.fstab=/path/to/fstab.alt
+Tell
+.Nm
+to use an alternate
+.Cm fstab
+to mount the file system from.  Remember, this file must be on the
+.Cm root=...
+file system provided to Finit from the kernel.  If this file is missing,
+.Nm
+falls back to its built-in default, which can be changed at build time
+using the
+.Cm --with-fstab=/path/to/footab
+configure option.  It is even possible to completely disable the
+built-in using
+.Cm --without-fstab ,
+meaning
+.Nm
+.Sy must
+be started with the
+.Cm finit.fstab
+option.
+.Pp
+Should
+.Nm
+discover that there is no fstab file available, including the fallback,
+it triggers the same failure mode as when
+.Cm fsck
+fails, starting
+.Xr sulogin 8 ,
+if that is availble.  When
+.Cm sulogin
+is missing, or when the user exits from
+.Cm sulogin ,
+the system is rebooted.
+.Pp
+Default fstab, unless changed at build-time:
+.Pa /etc/fstab
+.It Cm finit.status=<on,off>
+Control finit boot progress, including banner.  This used to be called
+.Cm finit.show_status ,
+which still works but is deprecated.
+.It Cm finit.status_style=<classic,modern>
+Set Finit boot progress style, when enabled.
+.It Cm rescue | recover
+Start rescue/maintenance mode.  If your system comes with the bundled
+.Cm sulogin
+program (Finit, or from util-linux/Busybox), you will be given a root
+login to a maintenance shell.  However, if
+.Cm sulogin
+is missing, the file
+.Pa /lib/finit/rescue.conf
+is read and the system booted in a limited fallback mode.  See
+.Xr finit.conf 5
+for more information.
+.It Cm single | S
+Single user mode, runlevel 1, in Finit.  Useful to debug problems with
+the regular runlevel.  All services and TTYs in
+.Cm [1]
+will be started, e.g., a
+.Cm tty [1] @console nologin
+configuration presents you with a root console without login.
+.El
 .Sh BOOTING
 .Pp
 Before laucnhing services, the system needs to be bootstrapped.  This
 involves mounting all filesystems (not already mounted by an initramfs)
 in
 .Pa /etc/fstab ,
+or any alternate
+.Pa fstab
+file provided on the Finit command line using
+.Cm finit.fstab ,
 ensuring that necessary filesystems like:
 .Pa /dev ,
 .Pa /proc ,
@@ -181,6 +181,12 @@ After which they have to be restarted manually using
 .Cm initctl restart NAME .
 The number of restarts, the delay between each restart, and more is
 configurable, see the options below.
+.Pp
+.Bd -filled -offset indent
+.Sy Tip:
+to allow endless restarts, see below option
+.Cm respawn
+.Ed
 .Pp  
 For daemons that support it, we recommend appending
 .Cm --foreground , --no-background , -n , -F ,
@@ -194,7 +200,21 @@ services and are supported using the same syntax as forking
 .Cm sysv
 services, using the
 .Cm pid:!/path/to/pidfile.pid
-command modifier syntax.
+command modifier syntax.  There is an alternative syntax that may be
+more intuitive, where Finit can also guess the PID file based on the
+daemon's command name:
+.Bd -unfilled -offset indent
+service type:forking ntpd -- NTP daemon
+.Ed
+.Pp
+Here we let BusyBox
+.Nm ntpd
+daemonize itself.  Finit uses the basename of the binary to guess the
+PID file to watch for the PID:
+.Pa /var/run/ntpd.pid .
+If Finit guesses wrong, you have to submit the full
+.Cm pid:!/path/to/file.pid
+option to your service stanza.
 .Pp
 .Sy Example: in the case of
 .Cm ospfd
@@ -287,6 +307,13 @@ and the above (2 and 5) will be used
 .It Cm norestart
 dont restart on failures, same as
 .Cm restart:0
+.It Cm respawn
+bypasses the
+.Cm restart
+mechanism completely, allows endless restarts.  Useful in many
+use-cases, but not what
+.Cm service
+was originally designed for so not the default behavior.
 .It Cm oncrash:reboot
 when all retries have failed, and the service
 has
@@ -24,9 +24,11 @@ This program follows the usual UNIX command line syntax, with long
 options starting with two dashes (`-').  The options are as follows:
 .Bl -tag -width Ds
 .It Fl b, -batch
-Batch mode, no screen size probing.
+Batch mode, no screen size probing.  Useful for scripting.
 .It Fl c, -create
-Create missing paths (and files) as needed.  Useful with the edit command.
+Create missing paths (and files) as needed.  Useful with the
+.Cm edit
+command.
 .It Fl f, -force
 Ignore missing files and arguments, never prompt.
 .It Fl h, -help
@@ -64,7 +66,16 @@ files in
 Create
 .Cm .conf
 in
-.Pa /etc/finit.d/available
+.Pa /etc/finit.d/available .
+.Pp
+Piping the contents into
+.Nm
+works as one would expect:
+.Bd -literal -offset indent
+echo "task name:foo /tmp/foo.sh -- Foo logger" | initctl create foo
+initctl enable foo
+initctl reload
+.Ed
 .It Nm Ar delete Ar CONF
 Delete
 .Cm .conf
@@ -113,6 +124,20 @@ i.e., activates changes
 .It Nm Ar cond set Ar COND
 Set (assert) user-defined condition,
 .Cm +usr/COND
+.It Nm Ar cond get Ar COND
+Get (quietly) the status of any condition.  Defaults to user-defined
+condions, but if a slash is detected, e.g.,
+.Cm pid/foo
+or
+.Cm net/eth0/exist ,
+then any condition can be read.
+.Pp
+The command is geared for scripting, check the exit code to get the
+status of the condition, or give
+.Nm
+the
+.Fl v
+option for a more verbose output.
 .It Nm Ar cond clr | clear Ar COND
 Clear (deassert) user-defined condition,
 .Cm -usr/COND
@@ -139,7 +164,24 @@ Start service by name, with optional ID, e.g.,
 .It Nm Ar stop Cm NAME[:ID]
 Stop/Pause a running service by name
 .It Nm Ar reload Cm NAME[:ID]
-Reload service by name (SIGHUP or restart)
+Reload service as if its configuration had changed.  Internally,
+.Nm finit
+marks the named service as "dirty" and turns the state machine,
+resulting in a SIGHUP or restart of (at least) the named service.
+Any dependant services are also restarted.
+.Pp
+.Sy Note:
+no .conf file is reloaded with this variant of the command.  Essentially
+it is the same as calling
+.Cm restart .
+Except for two things:
+.Bl -enum -offset indent -compact
+.It
+if the service supports HUP, it's signaled instead of stop-started, and
+.It
+it allows restarting run/task in the same runlevel -- which is otherwise
+restricted
+.El
 .It Nm Ar signal Cm NAME:[ID] S
 Send signal S to service, by name.
 .Cm S
@@ -64,6 +64,10 @@ if BUILD_DBUS_PLUGIN
 pkglib_LTLIBRARIES += dbus.la
 endif

+if BUILD_HOOK_SCRIPTS_PLUGIN
+pkglib_LTLIBRARIES += hook-scripts.la
+endif
+
 if BUILD_HOTPLUG_PLUGIN
 pkglib_LTLIBRARIES += hotplug.la
 endif
@@ -1,6 +1,6 @@
 /* Save and restore ALSA sound settings using alsactl
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Setup necessary system files for, e.g. UTMP (tracking logins)
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,8 +21,12 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <ftw.h>
+#ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <string.h>
 #ifdef _LIBITE_LITE
 # include <libite/lite.h>
@@ -39,10 +43,12 @@

 static int is_tmpfs(char *path)
 {
+	struct mntent mount;
+	struct mntent *mnt;
+	char buf[256];
 	int tmpfs = 0;
 	FILE *fp;
 	char *dir;
-	struct mntent *mnt;

 	/* If path is a symlink, check what it resolves to */
 	dir = realpath(path, NULL);
@@ -55,7 +61,7 @@ static int is_tmpfs(char *path)
 		return 0;	/* Dunno, maybe not */
 	}

-	while ((mnt = getmntent(fp))) {
+	while ((mnt = getmntent_r(fp, &mount, buf, sizeof(buf)))) {
 		if (!strcmp(dir, mnt->mnt_dir))
 			break;
 	}
@@ -135,7 +141,7 @@ static void setup(void *arg)
 		ln("/dev/shm", "/run/shm");

 		/* compat only, should really be set up by OS/dist */
-		ln("../run", "/var/run");
+		ln("/run", "/var/run");
 	} else {
 		makedir("/var/lock", 1777);
 		makedir("/var/run", 0755);
@@ -1,6 +1,6 @@
 /* Setup and start system message bus, D-Bus
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -0,0 +1,116 @@
+/* Trigger scripts to run from finit's hooks
+ *
+ * Copyright (c) 2022  Tobias Waldekranz <tobias@waldekranz.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+#include "config.h"
+
+#define CHOOSE(x, y) y
+static const char *hscript_paths[] = HOOK_TYPES;
+#undef CHOOSE
+
+static void hscript_run_parts(hook_point_t hook)
+{
+	char path[CMD_SIZE] = "";
+
+	strlcat(path, PLUGIN_HOOK_SCRIPTS_PATH, sizeof(path));
+	strlcat(path, hscript_paths[hook] + 4, sizeof(path));
+
+	run_parts(path, NULL);
+}
+
+static void hscript_banner(void *arg)
+{
+	hscript_run_parts(HOOK_BANNER);
+}
+
+static void hscript_rootfs_up(void *arg)
+{
+	hscript_run_parts(HOOK_ROOTFS_UP);
+}
+
+static void hscript_mount_error(void *arg)
+{
+	hscript_run_parts(HOOK_MOUNT_ERROR);
+}
+
+static void hscript_mount_post(void *arg)
+{
+	hscript_run_parts(HOOK_MOUNT_POST);
+}
+
+static void hscript_basefs_up(void *arg)
+{
+	hscript_run_parts(HOOK_BASEFS_UP);
+}
+
+static void hscript_network_up(void *arg)
+{
+	hscript_run_parts(HOOK_NETWORK_UP);
+}
+
+static void hscript_svc_up(void *arg)
+{
+	hscript_run_parts(HOOK_SVC_UP);
+}
+
+static void hscript_system_up(void *arg)
+{
+	hscript_run_parts(HOOK_SYSTEM_UP);
+}
+
+static void hscript_shutdown(void *arg)
+{
+	hscript_run_parts(HOOK_SHUTDOWN);
+}
+
+static plugin_t plugin = {
+	.name = __FILE__,
+	.hook[HOOK_BANNER]      = { .cb  = hscript_banner      },
+	.hook[HOOK_ROOTFS_UP]   = { .cb  = hscript_rootfs_up   },
+	.hook[HOOK_MOUNT_ERROR] = { .cb  = hscript_mount_error },
+	.hook[HOOK_MOUNT_POST]  = { .cb  = hscript_mount_post  },
+	.hook[HOOK_BASEFS_UP]   = { .cb  = hscript_basefs_up   },
+	.hook[HOOK_NETWORK_UP]  = { .cb  = hscript_network_up  },
+	.hook[HOOK_SVC_UP]      = { .cb  = hscript_svc_up      },
+	.hook[HOOK_SYSTEM_UP]   = { .cb  = hscript_system_up   },
+	.hook[HOOK_SHUTDOWN]    = { .cb  = hscript_shutdown    },
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -1,6 +1,6 @@
 /* Heuristically find and initialize a suitable hotplug daemon
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Coldplug modules using modalias magic
 *
- * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2021-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,29 @@
 * THE SOFTWARE.
 */

+/*
+ * This plugin scans files in /etc/modules-load.d/, for each line in the
+ * file it assumes the name of a kernel module, with optional arguments.
+ * Each module is loaded when entering runlevel 2, 3, 4, or 5, using the
+ * modprobe tool.
+ *
+ * Loading is done by inserting a `task` stanza in Finit, ensuring all
+ * modules are loaded in parallel, with other modules and programs.
+ * Each `task` stanza is by default given the name:modprobe.module and
+ * indexed with `:ID`, starting with 1.
+ *
+ * Indexing can be disabled per file in /etc/modules-load.d/, anywwhere
+ * in a file, by putting the keyword `noindex` on a line of its own.  A
+ * noindex command can appear anywhere in the file, and up to the point
+ * it is read, tasks will be indexed with an incrementing `:ID`.  When
+ * `noindex` is read indexing is disabled and all subseequent tasks will
+ * not have any `:ID` at all.
+ *
+ * Please note, the :ID is there for your benefit, it ensures that tasks
+ * in Finit are unique.  If you have two tasks with the same name and ID
+ * (or no ID), the last one read replaces any preceeding one!
+ */
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
@@ -40,57 +63,94 @@
 #define MODULES_LOAD_PATH "/etc/modules-load.d"
 #endif
 #define SERVICE_LINE \
-	"cgroup.init :%d name:modprobe.%s [2345] /sbin/modprobe %s %s -- Kernel module: %s"
+	"cgroup.init name:modprobe.%s :%d [2345] /sbin/modprobe %s %s -- Kernel module: %s"
+#define SERVICE_LINE_NOINDEX \
+	"cgroup.init name:modprobe.%s [2345] /sbin/modprobe %s %s -- Kernel module: %s"
+
+static int load_file(const char *file, int index)
+{
+	char module_path[PATH_MAX];
+	char line[256];
+	int num = 0;
+	FILE *fp;
+
+	strlcpy(module_path, MODULES_LOAD_PATH "/", sizeof(module_path));
+	strlcat(module_path, file, sizeof(module_path));
+
+	fp = fopen(module_path, "r");
+	if (!fp)
+		return 0;
+
+	while (fgets(line, sizeof(line), fp)) {
+		char cmd[CMD_SIZE], *mod, *args;
+
+		chomp(line);
+
+		mod = strip_line(line);
+		if (!mod[0])
+			continue;
+
+		if (mod[0] == '#' || mod[0] == ';')
+			continue;
+
+		if (!strcmp(mod, "set noindex")) {
+			index = 0;
+			continue;
+		}
+		if (!strncmp(mod, "set index", 9)) {
+			mod += 9;
+			args = strchr(mod, '=');
+			if (args) /* optional */
+				mod = args + 1;
+			index = atoi(mod);
+			continue;
+		}
+
+		mod = strtok_r(mod, " ", &args);
+		if (!mod)
+			continue;
+
+		if (!index)
+			snprintf(cmd, sizeof(cmd), SERVICE_LINE_NOINDEX, mod, mod, args, mod);
+		else
+			snprintf(cmd, sizeof(cmd), SERVICE_LINE, mod, index++, mod, args, mod);
+
+		service_register(SVC_TYPE_TASK, cmd, global_rlimit, NULL);
+		num++;
+	}
+	fclose(fp);
+
+	return num;
+}
+
+/* XXX: check here for .conf only? */
+static int module_filter(const struct dirent *d)
+{
+	if (d->d_type == DT_DIR)
+		return 0;
+	if (d->d_name[0] == '.')
+		return 0;	/* skip dot files */
+	if (d->d_name[strlen(d->d_name) - 1] == '~')
+		return 0;	/* skip backup files */
+
+	return 1;
+}

 static void load(void *arg)
 {
-	struct dirent *d;
-	char line[256];
+	struct dirent **dentry;
 	int index = 1;
-	FILE *fp;
-	DIR *dir;
+	int i, num;

 	_d("Scanning " MODULES_LOAD_PATH " for config files ...");
-
-	dir = opendir(MODULES_LOAD_PATH);
-	if (!dir)
-		return;
-
-	while ((d = readdir(dir))) {
-		char module_path[PATH_MAX];
-
-		strlcpy(module_path, MODULES_LOAD_PATH "/", sizeof(module_path));
-		strlcat(module_path, d->d_name, sizeof(module_path));
-
-		fp = fopen(module_path, "r");
-		if (!fp)
-			continue;
-
-		while (fgets(line, sizeof(line), fp)) {
-			char cmd[CMD_SIZE], *mod, *args;
-
-			mod = strip_line(line);
-			if (!*mod)
-				continue;
-
-			mod = chomp(mod);
-			if (!mod || !*mod)
-				continue;
-
-			mod = strtok_r(mod, " ", &args);
-			if (!mod)
-				continue;
-
-			snprintf(cmd, sizeof(cmd), SERVICE_LINE, index, mod, mod, args, mod);
-			service_register(SVC_TYPE_TASK, cmd, global_rlimit, NULL);
-
-			index++;
+	num = scandir(MODULES_LOAD_PATH, &dentry, module_filter, alphasort);
+	if (num > 0) {
+		for (i = 0; i < num; i++) {
+			index += load_file(dentry[i]->d_name, index);
+			free(dentry[i]);
 		}
-
-		fclose(fp);
+		free(dentry);
 	}
-
-	closedir(dir);
 }

 static plugin_t plugin = {
@@ -1,7 +1,8 @@
+
 /* Netlink plugin for IFUP/IFDN and GW events
 *
 * Copyright (C) 2009-2011  Mårten Wikström <marten.wikstrom@keystream.se>
- * Copyright (C) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (C) 2009-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -252,18 +253,18 @@ static int nl_parse(int sd)
 			return -1;
 		}

-		_d("recv %lld bytes", len);
+//		_d("recv %zd bytes", len);
 		l = (size_t)len;
 		for (nh = (struct nlmsghdr *)nl_buf; NLMSG_OK(nh, l); nh = NLMSG_NEXT(nh, l)) {
 			struct nlmsgerr *nle;

 			switch (nh->nlmsg_type) {
 			case NLMSG_DONE:
-				_d("Done with netlink messages.");
+//				_d("Done with netlink messages.");
 				return 0;

 			case NLMSG_ERROR:
-				_d("Kernel netlink comm. error.");
+//				_d("Kernel netlink comm. error.");
 				nle = NLMSG_DATA(nh);
 				if (nle) {
 					errno = -nle->error;
@@ -273,13 +274,13 @@ static int nl_parse(int sd)

 			case RTM_NEWROUTE:
 			case RTM_DELROUTE:
-				_d("Netlink route ...");
+//				_d("Netlink route ...");
 				nl_route(nh, len);
 				break;

 			case RTM_NEWLINK:
 			case RTM_DELLINK:
-				_d("Netlink link ...");
+//				_d("Netlink link ...");
 				nl_link(nh, len);
 				break;

@@ -303,14 +304,14 @@ static int nl_request(int sd, unsigned int seq, int type)

 	switch (type) {
 	case RTM_GETROUTE:
-		_d("RTM_GETROUTE");
+//		_d("RTM_GETROUTE");
 		nlr->rtm.rtm_family = AF_INET;
 		nlr->rtm.rtm_table  = RT_TABLE_MAIN;
 		nlr->nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct rtmsg));
 		break;

 	case RTM_GETLINK:
-		_d("RTM_GETLINK");
+//		_d("RTM_GETLINK");
 		nlr->ifi.ifi_family = AF_UNSPEC;
 		nlr->ifi.ifi_change = 0xFFFFFFFF;
 		nlr->nh.nlmsg_len   = NLMSG_LENGTH(sizeof(struct ifinfomsg));
@@ -449,6 +450,7 @@ PLUGIN_INIT(plugin_init)
 PLUGIN_EXIT(plugin_exit)
 {
 	plugin_unregister(&plugin);
+	close(plugin.io.fd);
 }

 /**
@@ -1,7 +1,7 @@
 /* Simple pidfile event monitor for the Finit condition engine
 *
 * Copyright (c) 2015-2016  Tobias Waldekranz <tobias@waldekranz.com>
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -98,10 +98,16 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 				return;
 			}

+			/* Service is not crashing, let's tell state machine! */
+			service_forked(svc);
+
 			if (pid != svc->pid) {
-				_d("Forking service %s changed PID from %d to %d",
-				   svc->cmd, svc->pid, pid);
+				_d("Forking service %s (cmd %s) changed PID from %d to %d",
+				   svc_ident(svc, NULL, 0), svc->cmd, svc->pid, pid);
 				svc->pid = pid;
+
+				/* Complement log in service.c for non-forking services */
+				logit(LOG_CONSOLE | LOG_NOTICE, "Started %s[%d]", svc_ident(svc, NULL, 0), pid);
 			}
 		}

@@ -305,8 +311,8 @@ PLUGIN_INIT(plugin_init)

 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_pidfile);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_pidfile);
 }

 /**
@@ -1,6 +1,6 @@
 /* Set kernel variables from /etc/sysctl.conf et al
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Setup necessary files for resolvconf
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Save and restore RTC using hwclock
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* System condition event monitor for the Finit condition engine
 *
- * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2021-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -160,23 +160,19 @@ 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 = {
@@ -201,8 +197,8 @@ PLUGIN_INIT(plugin_init)

 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_sys);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_sys);
 }

 /**
@@ -1,7 +1,7 @@
 /* Optional TTY Watcher, used to catch new TTYs that are discovered, e.g., USB
 *
 * Copyright (c) 2013  Mattias Walström <lazzer@gmail.com>
- * Copyright (c) 2013-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2013-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -116,10 +116,9 @@ PLUGIN_INIT(plugin_init)

 PLUGIN_EXIT(plugin_exit)
 {
+	plugin_unregister(&plugin);
 	if (plugin.io.fd)
 		close(plugin.io.fd);
-
-	plugin_unregister(&plugin);
 }

 /**
@@ -1,6 +1,6 @@
 /* Setup and save random seed at boot/shutdown
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* User-defined condition event monitor for the Finit condition engine
 *
- * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2021-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -123,8 +123,8 @@ PLUGIN_INIT(plugin_init)

 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_usr);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_usr);
 }

 /**
@@ -1,6 +1,6 @@
 /* Console setup (for X)
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -8,7 +8,10 @@ AM_LDFLAGS         = -export-dynamic
 endif

 sbin_PROGRAMS        = finit initctl
-pkglibexec_PROGRAMS  = getty logit sulogin
+pkglibexec_PROGRAMS  = getty logit
+if SULOGIN
+pkglibexec_PROGRAMS += sulogin
+endif
 if KEVENTD
 pkglibexec_PROGRAMS += keventd
 endif
@@ -1,6 +1,6 @@
 /* External client API, using UNIX domain socket.
 *
- * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2015-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -36,7 +38,6 @@
 #endif
 #include <uev/uev.h>

-#include "config.h"
 #include "finit.h"
 #include "cond.h"
 #include "conf.h"
@@ -197,7 +198,7 @@ static svc_t *do_find(char *buf, size_t len)
 	if (!id)
 		return svc_named_iterator(&iter, 1, input);

-	return svc_find_by_nameid(input, id);
+	return svc_find(input, id);
 }

 static svc_t *do_find_byc(char *buf, size_t len)
@@ -250,10 +251,10 @@ static int do_reboot(int cmd, char *buf, size_t len)
 	case INIT_CMD_SUSPEND:
 		_d("suspend");
 		sync();
-		rc = reboot(RB_SW_SUSPEND);
+		rc = suspend();
 		if (rc) {
 			if (errno == EINVAL)
-				snprintf(buf, len, "Kernel does not support suspend.");
+				snprintf(buf, len, "Kernel does not support suspend to RAM.");
 			else
 				snprintf(buf, len, "Failed: %s", strerror(errno));
 		}
@@ -1,6 +1,6 @@
 /* Finit control group support functions
 *
- * Copyright (c) 2019-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2019-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -465,9 +465,9 @@ 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.");
+			logit(LOG_INFO, "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.");
+			logit(LOG_INFO, "Not allowed to mount cgroups v2, disabling.");
 		else
 			_pe("Failed mounting cgroup v2");
 		avail = 0;
@@ -526,7 +526,7 @@ void cgroup_init(uev_ctx_t *ctx)

 	/* Move ourselves to init (best effort, otherwise run in 'root' group */
 	if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs")) {
-		_pe("Failed moving PID 1 to cgroup ", FINIT_CGPATH "/init");
+		_pe("Failed moving PID 1 to cgroup %s", FINIT_CGPATH "/init");
 		uev_io_stop(&cgw);
 		iwatch_exit(&iw_cgroup);
 		close(fd);
@@ -1,6 +1,6 @@
 /* Finit control group support functions
 *
- * Copyright (c) 2019-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2019-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* New client tool, replaces old /dev/initctl API and telinit tool
 *
- * Copyright (c) 2019-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2019-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@

 #include "config.h"

-#include <err.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <signal.h>
@@ -244,7 +243,7 @@ static float cgroup_cpuload(struct cg *cg)
 	snprintf(fn, sizeof(fn), "%s/cpu.stat", cg->cg_path);
 	fp = fopen(fn, "r");
 	if (!fp)
-		err(1, "Cannot open %s", fn);
+		ERR(72, "Cannot open %s", fn);

 	while (fgets(buf, sizeof(buf), fp)) {
 		uint64_t curr;
@@ -280,13 +279,13 @@ static struct cg *append(char *path)
 	if (access(fn, F_OK)) {
 		/* older kernels, 4.19, don't have summary cpu.stat in root */
 		if (strcmp(path, FINIT_CGPATH))
-			warn("not a cgroup path with cpu controller, %s", path);
+			WARN("not a cgroup path with cpu controller, %s", path);
 		return NULL;
 	}

 	cg = calloc(1, sizeof(struct cg));
 	if (!cg)
-		err(1, "failed allocating struct cg");
+		ERR(71, "failed allocating struct cg");

 	cg->cg_path = strdup(path);
 	if (list)
@@ -296,7 +295,7 @@ static struct cg *append(char *path)
 	item.key  = cg->cg_path;
 	item.data = cg;
 	if (!hsearch(item, ENTER))
-		err(1, "failed adding to hash table");
+		ERR(70, "failed adding to hash table");

 	return cg;
 }
@@ -434,7 +433,6 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
 			pid_comm(pid, comm, sizeof(comm));
 			if (pid_cmdline(pid, buf, sizeof(buf))) {
 				char proc[ttcols];
-				int len;

 				switch (mode) {
 				case 1:
@@ -456,6 +454,8 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
 				if (plain) {
 					strlcat(row, proc, rplen);
 				} else {
+					int len;
+
 					strlcat(row, CDIM, rlen);
 					strlcat(row, proc, rlen);

@@ -600,7 +600,6 @@ int show_cgtop(char *arg)
        uev_t timer, input, sigint, sigterm, sigquit;
 	char path[512];
        uev_ctx_t ctx;
-	int flags;

 	if (!arg)
 		arg = FINIT_CGPATH;
@@ -610,7 +609,7 @@ int show_cgtop(char *arg)
 	}

 	if (!hcreate(ttrows + 25))
-		err(1, "failed creating hash table");
+		ERR(70, "failed creating hash table");

 	sysinfo(&si);
 	total_ram = si.totalram * si.mem_unit;
@@ -619,6 +618,8 @@ int show_cgtop(char *arg)
        uev_timer_init(&ctx, &timer, cgtop, arg, 1, ionce ? 0 : 1000);

 	if (!ionce && !plain) {
+		int flags;
+
 		atexit(cleanup);
 		ttraw();
 		hidecursor();
@@ -1,6 +1,6 @@
 /* Cgroup utility functions for initctl
 *
- * Copyright (c) 2019-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2019-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* External client API, using UNIX domain socket.
 *
- * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2015-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,13 +21,13 @@
 * THE SOFTWARE.
 */

-#include <err.h>
 #include <errno.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>

 #include "client.h"
+#include "initctl.h"

 static int sd = -1;

@@ -39,11 +39,17 @@ int client_connect(void)
 	};

 	sd = socket(AF_UNIX, SOCK_SEQPACKET, 0);
-	if (-1 == sd)
-		err(1, "Failed creating UNIX domain socket");
+	if (-1 == sd) {
+		WARN("Failed creating UNIX domain socket");
+		return -1;
+	}

-	if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1)
-		err(1, "Failed connecting to finit");
+	if (connect(sd, (struct sockaddr*)&sun, sizeof(sun)) == -1) {
+		if (errno != ENOENT)
+			WARNX("Failed connecting to finit");
+		close(sd);
+		return -1;
+	}

 	return sd;
 }
@@ -66,22 +72,21 @@ int client_disconnect(void)
 int client_send(struct init_request *rq, ssize_t len)
 {
 	struct pollfd pfd = { 0 };
-	int sd, result = 255;
+	int result = 255;
 	int rc;

-	sd = client_connect();
-	if (-1 == sd)
+	if (client_connect() == -1)
 		return -1;

 	pfd.fd     = sd;
 	pfd.events = POLLOUT;
 	if (poll(&pfd, 1, 2000) <= 0) {
-		warn("Timed out waiting for Finit, errno %d", errno);
+		WARN("Timed out waiting for Finit, errno %d", errno);
 		goto exit;
 	}

 	if (write(sd, rq, len) != len) {
-		warn("Failed communicating with Finit, errno %d", errno);
+		WARN("Failed communicating with Finit, errno %d", errno);
 		goto exit;
 	}

@@ -91,14 +96,14 @@ int client_send(struct init_request *rq, ssize_t len)
 		if (rc) {
 			if (errno == EINTR) /* shutdown/reboot */
 				goto exit;
-			warn("poll(), errno %d", errno);
+			WARN("poll(), errno %d", errno);
 		} else
-			warnx("Timed out waiting for reply from Finit.");
+			WARNX("Timed out waiting for reply from Finit.");
 		goto exit;
 	}

 	if (read(sd, rq, len) != len) {
-		warn("Failed reading reply from Finit, errno %d", errno);
+		WARN("Failed reading reply from Finit, errno %d", errno);
 		goto exit;
 	}

@@ -114,15 +119,13 @@ exit:

 svc_t *client_svc_iterator(int first)
 {
-	int sd = -1;
 	struct init_request rq = {
 		.magic = INIT_MAGIC,
 		.cmd   = INIT_CMD_SVC_ITER,
 	};
 	static svc_t svc;

-	sd = client_connect();
-	if (sd == -1)
+	if (client_connect() == -1)
 		return NULL;

 	if (first)
@@ -141,7 +144,7 @@ svc_t *client_svc_iterator(int first)

 	return &svc;
 error:
-	perror("Failed communicating with finit");
+	WARN("Failed communicating with finit, error %d", errno);
 	client_disconnect();
 	sd = -1;

@@ -155,10 +158,8 @@ svc_t *do_cmd(int cmd, const char *arg)
 		.cmd   = cmd,
 	};
 	static svc_t svc;
-	int sd = -1;

-	sd = client_connect();
-	if (sd == -1)
+	if (client_connect() == -1)
 		return NULL;

 	strlcpy(rq.data, arg, sizeof(rq.data));
@@ -174,7 +175,7 @@ svc_t *do_cmd(int cmd, const char *arg)
 	return &svc;
 error:
 	client_disconnect();
-	perror("Failed communicating with finit");
+	WARN("Failed communicating with finit, error %d", errno);

 	return NULL;
 }
@@ -1,6 +1,6 @@
 /* External client API, using UNIX domain socket.
 *
- * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2015-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,7 @@
 * THE SOFTWARE.
 */

+#include <dirent.h>
 #include <ftw.h>
 #include <libgen.h>
 #include <stdio.h>
@@ -132,6 +133,25 @@ static int cond_checkpath(const char *path)
 	return 0;
 }

+/* Intended for 'service/foo/`, nothing else */
+static void cond_delpath(const char *path)
+{
+	char fn[PATH_MAX];
+	struct dirent *d;
+	DIR *dir;
+
+	dir = opendir(path);
+	if (!dir)
+		return;
+
+	while ((d = readdir(dir))) {
+		paste(fn, sizeof(fn), path, d->d_name);
+		remove(fn);
+	}
+	closedir(dir);
+	unlink(path);
+}
+
 int cond_set_path(const char *path, enum cond_state next)
 {
 	enum cond_state prev;
@@ -155,8 +175,18 @@ int cond_set_path(const char *path, enum cond_state next)
 		break;

 	case COND_OFF:
-		if (unlink(path) && errno != ENOENT)
-			_pe("Failed removing condition '%s'", path);
+		if (unlink(path)) {
+			switch (errno) {
+			case ENOENT:
+				break;
+			case EISDIR:
+				cond_delpath(path);
+				break;
+			default:
+				_pe("Failed removing condition '%s'", path);
+				break;
+			}
+		}
 		break;

 	default:
@@ -1,6 +1,6 @@
 /* Parser for /etc/finit.conf and /etc/finit.d/<SVC>.conf
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -54,6 +54,12 @@
 int logfile_size_max = 200000;	/* 200 kB */
 int logfile_count_max = 5;

+struct env_entry {
+	TAILQ_ENTRY(env_entry) link;
+	char *name;
+};
+static TAILQ_HEAD(, env_entry) env_list = TAILQ_HEAD_INITIALIZER(env_list);
+
 struct rlimit initial_rlimit[RLIMIT_NLIMITS];
 struct rlimit global_rlimit[RLIMIT_NLIMITS];

@@ -67,7 +73,7 @@ struct conf_change {
 static struct iwatch iw_conf;
 static uev_t etcw;

-static TAILQ_HEAD(head, conf_change) conf_change_list = TAILQ_HEAD_INITIALIZER(conf_change_list);
+static TAILQ_HEAD(, conf_change) conf_change_list = TAILQ_HEAD_INITIALIZER(conf_change_list);

 static int  parse_conf(char *file, int is_rcsd);
 static void drop_changes(void);
@@ -86,8 +92,9 @@ fallback:
 }

 /*
- * finit.debug = [on,off]
- * finit.show_status = [on,off]
+ * finit.debug  = [on,off]
+ * finit.fstab  = /path/to/etc/fstab.aternative
+ * finit.status = [on,off]     (compat finit.show_status)
 * finit.status_style = [old,classic,modern]
 */
 static void parse_finit_opts(char *opt)
@@ -103,6 +110,11 @@ static void parse_finit_opts(char *opt)
 		return;
 	}

+	if (string_compare(opt, "fstab")) {
+		fstab = arg;
+		return;
+	}
+
 	if (string_compare(opt, "status_style")) {
 		if (!arg) {
 			_e("status_style option requires an argument, skipping.");
@@ -116,12 +128,39 @@ static void parse_finit_opts(char *opt)
 		return;
 	}

-	if (string_compare(opt, "show_status")) {
+	if (string_compare(opt, "status") || string_compare(opt, "show_status")) {
 		show_progress(get_bool(arg, 1) ? PROGRESS_DEFAULT : PROGRESS_SILENT);
 		return;
 	}
 }

+/*
+ * When runlevel (single integer) is given on the command line,
+ * it overrides the runlevel in finit.conf and the built-in
+ * default (from configure).  It do however have to pass the
+ * same sanity checks.
+ */
+static int parse_runlevel(char *arg)
+{
+	const char *err = NULL;
+	char *ptr = arg;
+	long long num;
+
+	/* Sanity check the token is just digit(s) */
+	while (*ptr) {
+		if (!isdigit(*ptr++))
+			return 0;
+	}
+
+	num = strtonum(arg, 1, 9, &err);
+	if (err || num == 6) {
+		_d("Not a valid runlevel (%s), valid levels are [1-9], excluding 6, skipping.", arg);
+		return 0;
+	}
+
+	return (int)num;
+}
+
 static void parse_arg(char *arg)
 {
 	if (!strncmp(arg, "finit.", 6)) {
@@ -129,11 +168,19 @@ static void parse_arg(char *arg)
 		return;
 	}

-	if (string_compare(arg, "rescue") || string_compare(arg, "recover"))
+	if (string_compare(arg, "rescue") || string_compare(arg, "recover")) {
 		rescue = 1;
+		return;
+	}

-	if (string_compare(arg, "single") || string_compare(arg, "S"))
+	if (string_compare(arg, "single") || string_compare(arg, "S")) {
 		single = 1;
+		return;
+	}
+
+	/* Put any new command line options before this line. */
+
+	cmdlevel = parse_runlevel(arg);
 }

 #ifdef KERNEL_CMDLINE
@@ -205,8 +252,98 @@ void conf_parse_cmdline(int argc, char *argv[])

 	parse_kernel_cmdline();
 	parse_kernel_loglevel();
+}

-	log_init();
+/*
+ * Clear all environment variables read in parse_env(), they may be
+ * removed now so let the next call to parse_env() restore them.
+ */
+void conf_reset_env(void)
+{
+	struct env_entry *node, *tmp;
+
+	TAILQ_FOREACH_SAFE(node, &env_list, link, tmp) {
+		TAILQ_REMOVE(&env_list, node, link);
+		if (node->name) {
+			unsetenv(node->name);
+			free(node->name);
+		}
+		free(node);
+	}
+
+	setenv("PATH", _PATH_STDPATH, 1);
+	setenv("SHELL", _PATH_BSHELL, 1);
+	setenv("LOGNAME", "root", 1);
+	setenv("USER", "root", 1);
+}
+
+/*
+ * Sets, and makes a note of, all KEY=VALUE lines in a given .conf line
+ * from finit.conf, or other .conf file.  Note, PATH is always reset in
+ * the conf_reset_env() function.
+ */
+static void parse_env(char *line)
+{
+	struct env_entry *node;
+	char *key, *val, *end;
+
+	/* skip any leading whitespace */
+	key = line;
+	while (isspace(*key))
+		key++;
+
+	/* find end of line */
+	end = key;
+	while (*end)
+		end++;
+
+	/* strip trailing whitespace */
+	if (end > key) {
+		end--;
+		while (isspace(*end))
+			*end-- = 0;
+	}
+
+	val = strchr(key, '=');
+	if (!val)
+		return;
+	*val++ = 0;
+
+	/* strip leading whitespace from value */
+	while (isspace(*val))
+		val++;
+
+	/* unquote value, if quoted */
+	if (val[0] == '"' || val[0] == '\'') {
+		char q = val[0];
+
+		if (*end == q) {
+			val = &val[1];
+			*end = 0;
+		}
+	}
+
+	/* find end of key */
+	end = key;
+	while (*end)
+		end++;
+
+	/* strip trailing whitespace */
+	if (end > key) {
+		end--;
+		while (isspace(*end))
+			*end-- = 0;
+	}
+
+	setenv(key, val, 1);
+
+	node = malloc(sizeof(*node));
+	if (!node) {
+		_pe("Out of memory cannot track env vars");
+		return;
+	}
+	node->name = strdup(key);
+	TAILQ_INSERT_HEAD(&env_list, node, link);
 }

 static int kmod_exists(char *mod)
@@ -317,12 +454,12 @@ void conf_parse_cond(svc_t *svc, char *cond)
 	ptr[i] = 0;

 	if (i >= sizeof(svc->cond)) {
-		logit(LOG_WARNING, "Too long event list in declaration of %s: %s", svc->cmd, ptr);
+		logit(LOG_WARNING, "Too long event list in declaration of %s: %s", svc_ident(svc, NULL, 0), ptr);
 		return;
 	}

 	if (!strncmp(ptr, "svc/", 4)) {
-		logit(LOG_ERR, "Unsupported cond syntax for %s: <%s", svc->cmd, ptr);
+		logit(LOG_ERR, "Unsupported cond syntax for %s: <%s", svc_ident(svc, NULL, 0), ptr);
 		return;
 	}

@@ -480,7 +617,7 @@ static void conf_parse_cgroup(char *line)
 	cgroup_add(name, config, 0);
 }

-static void parse_static(char *line, int is_rcsd)
+static int parse_static(char *line, int is_rcsd)
 {
 	char cmd[CMD_SIZE];
 	char *x;
@@ -488,7 +625,7 @@ static void parse_static(char *line, int is_rcsd)
 	if (BOOTSTRAP && (MATCH_CMD(line, "host ", x) || MATCH_CMD(line, "hostname ", x))) {
 		if (hostname) free(hostname);
 		hostname = strdup(strip_line(x));
-		return;
+		return 0;
 	}

 	if (BOOTSTRAP && MATCH_CMD(line, "mknod ", x)) {
@@ -497,25 +634,25 @@ static void parse_static(char *line, int is_rcsd)
 		strcpy(cmd, "mknod ");
 		strlcat(cmd, dev, sizeof(cmd));
 		run_interactive(cmd, "Creating device node %s", dev);
-		return;
+		return 0;
 	}

 	/* Kernel module to load */
 	if (BOOTSTRAP && MATCH_CMD(line, "module ", x)) {
 		kmod_load(strip_line(x));
-		return;
+		return 0;
 	}

 	if (BOOTSTRAP && MATCH_CMD(line, "network ", x)) {
 		if (network) free(network);
 		network = strdup(strip_line(x));
-		return;
+		return 0;
 	}

 	if (BOOTSTRAP && MATCH_CMD(line, "runparts ", x)) {
 		if (runparts) free(runparts);
 		runparts = strdup(strip_line(x));
-		return;
+		return 0;
 	}

 	if (MATCH_CMD(line, "include ", x)) {
@@ -524,11 +661,10 @@ static void parse_static(char *line, int is_rcsd)
 		strlcpy(cmd, file, sizeof(cmd));
 		if (!fexist(cmd)) {
 			_e("Cannot find include file %s, absolute path required!", x);
-			return;
+			return 1;
 		}

-		parse_conf(cmd, is_rcsd);
-		return;
+		return parse_conf(cmd, is_rcsd);
 	}

 	if (MATCH_CMD(line, "log ", x)) {
@@ -549,12 +685,14 @@ static void parse_static(char *line, int is_rcsd)
 			logfile_size_max = size;
 		if (count >= 0)
 			logfile_count_max = count;
+
+		return 0;
 	}

 	if (MATCH_CMD(line, "shutdown ", x)) {
 		if (sdown) free(sdown);
 		sdown = strdup(strip_line(x));
-		return;
+		return 0;
 	}

 	/*
@@ -571,7 +709,7 @@ static void parse_static(char *line, int is_rcsd)
 			cfglevel = RUNLEVEL;
 		if (cfglevel < 1 || cfglevel > 9 || cfglevel == 6)
 			cfglevel = 2; /* Fallback */
-		return;
+		return 0;
 	}

 	/*
@@ -591,72 +729,65 @@ static void parse_static(char *line, int is_rcsd)
 			if (disabled)
 				service_init();
 		}
-		return;
+		return 0;
 	}
+
+	return 1;
 }

-static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
+static int parse_dynamic(char *line, struct rlimit rlimit[], char *file)
 {
 	char *x;

 	/* Monitored daemon, will be respawned on exit */
 	if (MATCH_CMD(line, "service ", x)) {
 		service_register(SVC_TYPE_SERVICE, x, rlimit, file);
-		return;
+		return 0;
 	}

 	/* One-shot task, will not be respawned */
 	if (MATCH_CMD(line, "task ", x)) {
 		service_register(SVC_TYPE_TASK, x, rlimit, file);
-		return;
+		return 0;
 	}

 	/* Like task but waits for completion, useful w/ [S] */
 	if (MATCH_CMD(line, "run ", x)) {
 		service_register(SVC_TYPE_RUN, x, rlimit, file);
-		return;
+		return 0;
 	}

 	/* Similar to task but is treated like a SysV init script */
 	if (MATCH_CMD(line, "sysv ", x)) {
 		service_register(SVC_TYPE_SYSV, x, rlimit, file);
-		return;
+		return 0;
 	}

 	/* Read resource limits */
 	if (MATCH_CMD(line, "rlimit ", x)) {
 		conf_parse_rlimit(x, rlimit);
-		return;
+		return 0;
 	}

 	/* Read control group limits */
 	if (MATCH_CMD(line, "cgroup ", x)) {
 		conf_parse_cgroup(x);
-		return;
+		return 0;
 	}

 	/* Set current cgroup for the following services/run/tasks */
 	if (MATCH_CMD(line, "cgroup.", x)) {
 		strlcpy(cgroup_current, x, sizeof(cgroup_current));
-		return;
+		return 0;
 	}

 	/* Regular or serial TTYs to run getty */
 	if (MATCH_CMD(line, "tty ", x)) {
 		service_register(SVC_TYPE_TTY, strip_line(x), rlimit, file);
-		return;
+		return 0;
 	}
-}

-static void tabstospaces(char *line)
-{
-	if (!line)
-		return;
-
-	for (int i = 0; line[i]; i++) {
-		if (line[i] == '\t')
-			line[i] = ' ';
-	}
+	return 1;
 }

 static int parse_conf(char *file, int is_rcsd)
@@ -690,8 +821,13 @@ static int parse_conf(char *file, int is_rcsd)
 		if (MATCH_CMD(line, "#", x))
 			continue;

-		parse_static(line, is_rcsd);
-		parse_dynamic(line, is_rcsd ? rlimit : global_rlimit, file);
+		if (!parse_static(line, is_rcsd))
+			continue;
+		if (!parse_dynamic(line, is_rcsd ? rlimit : global_rlimit, file))
+			continue;
+
+		/* Not static or dynamic conf, check if it is a global env. */
+		parse_env(line);
 	}

 	fclose(fp);
@@ -715,6 +851,7 @@ int conf_reload(void)
 	/* Mark and sweep */
 	cgroup_mark_all();
 	svc_mark_dynamic();
+	conf_reset_env();

 	/*
 	 * Reset global rlimit to bootstrap values from conf_init().
@@ -1,6 +1,6 @@
 /* Parser for /etc/finit.conf and /etc/finit.d/<SVC>.conf
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -42,6 +42,7 @@ int  conf_any_change      (void);
 int  conf_changed         (char *file);
 int  conf_monitor         (void);

+void conf_reset_env       (void);
 void conf_parse_cmdline   (int argc, char *argv[]);
 int  conf_parse_runlevels (char *runlevels);
 void conf_parse_cond      (svc_t *svc, char *cond);
@@ -1,7 +1,7 @@
 /* Functions for exec'ing processes
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -97,12 +97,14 @@ static int do_redirect(void)
 */
 int run(char *cmd, char *log)
 {
+	char *args[NUM_ARGS + 1] = { 0 };
 	int status, result, i = 0;
-	char *args[NUM_ARGS + 1], *arg;
 	char *backup = NULL;
 	pid_t pid;

 	if (!log) {
+		char *arg;
+
 		/* We must create a copy that is possible to modify. */
 		backup = arg = strdup(cmd);
 		if (!arg)
@@ -164,7 +166,7 @@ int run(char *cmd, char *log)

 		_exit(rc);
 	} else if (-1 == pid) {
-		_pe("%s", args[0]);
+		_pe("%s", !log ? args[0] : cmd);
 		if (backup)
 			free(backup);

@@ -1,7 +1,7 @@
 /* Finit - Fast /sbin/init replacement w/ I/O, hook & service plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,16 +26,18 @@

 #include <ctype.h>
 #include <dirent.h>
-#ifdef HAVE_FSTAB_H
-#include <fstab.h>
-#endif
 #include <getopt.h>
+#ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <time.h>		/* tzet() */
 #include <sys/klog.h>
 #include <sys/mount.h>
 #include <sys/stat.h>		/* umask(), mkdir() */
 #include <sys/wait.h>
+#ifdef HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
 #ifdef _LIBITE_LITE
 # include <libite/lite.h>
 #else
@@ -60,12 +62,14 @@

 int   runlevel  = 0;		/* Bootstrap 'S' */
 int   cfglevel  = RUNLEVEL;	/* Fallback if no configured runlevel */
+int   cmdlevel  = 0;		/* runlevel override from cmdline */
 int   prevlevel = -1;
 int   debug     = 0;		/* debug mode from kernel cmdline */
 int   rescue    = 0;		/* rescue mode from kernel cmdline */
 int   single    = 0;		/* single user mode from kernel cmdline */
 int   bootstrap = 1;		/* set while bootrapping (for TTYs) */
 int   kerndebug = 0;		/* set if /proc/sys/kernel/printk > 7 */
+char *fstab     = FINIT_FSTAB;
 char *sdown     = NULL;
 char *network   = NULL;
 char *hostname  = NULL;
@@ -106,70 +110,167 @@ static void banner(void)
 #endif
 }

+static int sulogin(int do_reboot)
+{
+	int rc = EX_OSFILE;
+	char *cmd[] = {
+		_PATH_SULOGIN,
+		"sulogin",
+	};
+	size_t i;
+
+	for (i = 0; i < NELEMS(cmd); i++) {
+		char *path = which(cmd[i]);
+
+		if (access(path, X_OK)) {
+			free(path);
+			continue;
+		}
+
+		rc = systemf("%s", path);
+		free(path);
+		break;
+	}
+
+	if (do_reboot) {
+		do_shutdown(SHUT_REBOOT);
+		exit(rc);
+	}
+
+	return rc;
+}
+
+char *fs_root_dev(char *real, size_t len)
+{
+	struct dirent *d;
+	struct stat st;
+	int found = 0;
+	dev_t dev;
+	DIR *dir;
+
+	if (stat("/", &st))
+		return NULL;
+
+	if (S_ISBLK(st.st_mode))
+		dev = st.st_rdev;
+	else
+		dev = st.st_dev;
+
+	dir = opendir("/sys/block");
+	if (!dir)
+		return NULL;
+
+	while ((d = readdir(dir))) {
+		char buf[10];
+		char *ptr;
+
+		if (fnread(buf, sizeof(buf), "/sys/block/%s/dev", d->d_name) == -1)
+			continue;
+
+		ptr = strchr(buf, ':');
+		if (!ptr)
+			continue;
+		*ptr++ = 0;
+
+		if (atoi(buf) == (int)major(dev) && atoi(ptr) == (int)minor(dev)) {
+			/* Guess name, assume no renaming */
+			snprintf(real, len, "/dev/%s", d->d_name);
+			found = 1;
+			break;
+		}
+	}
+
+	closedir(dir);
+	if (!found)
+		return NULL;
+
+	return real;
+}
+
 /*
 * Check all filesystems in /etc/fstab with a fs_passno > 0
 */
 static int fsck(int pass)
 {
-	struct fstab *fs;
+	struct mntent mount;
+	struct mntent *mnt;
+	char real[192];
+	char buf[256];
 	int rc = 0;
+	FILE *fp;

-	if (!setfsent()) {
-		_pe("Failed opening fstab");
-		return 1;
+	fp = setmntent(fstab, "r");
+	if (!fp) {
+		_pe("Failed opening fstab: %s", fstab);
+		sulogin(1);
 	}
-
-	while ((fs = getfsent())) {
-		char cmd[80];
-		struct stat st;
+	_d("Opened %s, pass %d", fstab, pass);
+	while ((mnt = getmntent_r(fp, &mount, buf, sizeof(buf)))) {
 		int fsck_rc = 0;
+		struct stat st;
+		char cmd[256];
+		char *dev;

-		if (fs->fs_passno != pass)
+		_d("got: fsname '%s' dir '%s' type '%s' opts '%s' freq '%d' passno '%d'",
+		   mnt->mnt_fsname, mnt->mnt_dir, mnt->mnt_type, mnt->mnt_opts,
+		   mnt->mnt_freq, mnt->mnt_passno);
+
+		if (mnt->mnt_passno == 0 || mnt->mnt_passno != pass)
 			continue;

+		/* Device to maybe fsck,  */
+		dev = mnt->mnt_fsname;
+
 		errno = 0;
-		if (stat(fs->fs_spec, &st) || !S_ISBLK(st.st_mode)) {
-			if (!string_match(fs->fs_spec, "UUID=") && !string_match(fs->fs_spec, "LABEL=")) {
-				_d("Cannot fsck %s, not a block device: %s", fs->fs_spec, strerror(errno));
+		if (stat(dev, &st) || !S_ISBLK(st.st_mode)) {
+			int skip = 1;
+
+			if (string_match(dev, "UUID=") || string_match(dev, "LABEL="))
+				skip = 0;
+
+			/*
+			 * Kernel short form for root= device, figure out
+			 * actual device since we cannot rely on symlinks
+			 * https://bugs.busybox.net/show_bug.cgi?id=8891
+			 */
+			else if (string_compare(dev, "/dev/root")) {
+				if (fs_root_dev(real, sizeof(real))) {
+					dev = real;
+					skip = 0;
+				}
+			}
+
+			if (skip) {
+				_d("Cannot fsck %s, not a block device: %s", dev, strerror(errno));
 				continue;
 			}
 		}

-		if (ismnt("/proc/mounts", fs->fs_file, "rw")) {
-			_d("Skipping fsck of %s, already mounted rw on %s.", fs->fs_spec, fs->fs_file);
+		if (ismnt("/proc/mounts", mnt->mnt_dir, "rw")) {
+			_d("Skipping fsck of %s, already mounted rw on %s.", dev, mnt->mnt_dir);
 			continue;
 		}

 #ifdef FSCK_FIX
-		snprintf(cmd, sizeof(cmd), "fsck -yf %s", fs->fs_spec);
+		snprintf(cmd, sizeof(cmd), "fsck -yf %s", dev);
 #else
-		snprintf(cmd, sizeof(cmd), "fsck -a %s", fs->fs_spec);
+		snprintf(cmd, sizeof(cmd), "fsck -a %s", dev);
 #endif
-		fsck_rc = run_interactive(cmd, "Checking filesystem %.13s", fs->fs_spec);
+		_d("Running pass %d fsck command %s", pass, cmd);
+		fsck_rc = run_interactive(cmd, "Checking filesystem %s", dev);
 		/*
 		 * "failure" is defined as exiting with a return code of
 		 * 2 or larger.  A return code of 1 indicates that filesystem
 		 * errors were corrected but that the boot may proceed.
 		 */
 		if (fsck_rc > 1) {
-			char *sulogin[] = {
-				_PATH_SULOGIN,
-				"sulogin",
-			};
-			size_t i;
-
-			for (i = 0; i < NELEMS(sulogin); i++) {
-				if (systemf(sulogin[i]))
-					continue;
-				break;
-			}
-
-			do_shutdown(SHUT_REBOOT);
+			logit(LOG_CONSOLE | LOG_ALERT, "Failed fsck %s, attempting sulogin ...", dev);
+			sulogin(1);
 		}
 		rc += fsck_rc;
 	}

-	endfsent();
+	endmntent(fp);

 	return rc;
 }
@@ -202,38 +303,22 @@ static void fs_mount(const char *src, const char *tgt, const char *fstype,
 }

 #ifndef SYSROOT
-/* If / is not listed in fstab, or listed as 'ro', leave it alone */
-static int fs_readonly_root(struct fstab *fs)
-{
-	char *tok, *str;
-
-	if (!fs)
-		return 1;
-
-	str = fs->fs_mntops;
-	while ((tok = strtok(str, ","))) {
-		if (!strcmp(tok, "ro"))
-			return 1;
-
-		str = NULL;
-	}
-
-	return 0;
-}
-
 static void fs_remount_root(int fsckerr)
 {
-	struct fstab *fs;
+	struct mntent *mnt;
+	FILE *fp;

-	if (!setfsent())
+	fp = setmntent(fstab, "r");
+	if (!fp)
 		return;

-	while ((fs = getfsent())) {
-		if (!strcmp(fs->fs_file, "/"))
+	while ((mnt = getmntent(fp))) {
+		if (!strcmp(mnt->mnt_dir, "/"))
 			break;
 	}

-	if (fs_readonly_root(fs))
+	/* If / is not listed in fstab, or listed as 'ro', leave it alone */
+	if (!mnt || hasmntopt(mnt, "ro"))
 		goto out;

 	if (fsckerr)
@@ -243,7 +328,7 @@ static void fs_remount_root(int fsckerr)
 				"Remounting / as read-write");

 out:
-	endfsent();
+	endmntent(fp);
 }
 #else
 static void fs_remount_root(int fsckerr)
@@ -319,22 +404,69 @@ static void fs_finalize(void)
 		fs_mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV, "mode=1777");
 }

+static void fs_swapon(char *cmd, size_t len)
+{
+	struct mntent *mnt;
+	FILE *fp;
+
+	if (!whichp("swapon"))
+		return;
+
+	fp = setmntent(fstab, "r");
+	if (!fp)
+		return;
+
+	while ((mnt = getmntent(fp))) {
+		if (strcmp(mnt->mnt_type, MNTTYPE_SWAP))
+			continue;
+
+		snprintf(cmd, len, "swapon %s", mnt->mnt_fsname);
+		run_interactive(cmd, "Enabling swap %s", mnt->mnt_fsname);
+	}
+
+	endmntent(fp);
+}
+
 static void fs_mount_all(void)
 {
+	char cmd[256] = "mount -na";
+
+	if (!fstab || !fexist(fstab)) {
+		logit(LOG_CONSOLE | LOG_NOTICE, "%s system fstab %s, trying fallback ...",
+		      !fstab ? "Missing" : "Cannot find", fstab ?: "\b");
+		fstab = FINIT_FSTAB;
+	}
+	if (!fstab || !fexist(fstab)) {
+		logit(LOG_CONSOLE | LOG_EMERG, "%s system fstab %s, attempting sulogin ...",
+		      !fstab ? "Missing" : "Cannot find", fstab ?: "\b");
+		sulogin(1);
+	}
+
+	/*
+	 * Needed by fsck, both BusyBox and util-linux support this.
+	 * We leave it set in the env. for the benefit of any mount
+	 * helpers and other system tools that the user expects to
+	 * behave even if we've booted with a different fstab.
+	 */
+	setenv("FSTAB_FILE", fstab, 1);
+
 	if (!rescue)
 		fs_remount_root(fsck_all());

 	_d("Root FS up, calling hooks ...");
 	plugin_run_hooks(HOOK_ROOTFS_UP);

-	if (run_interactive("mount -na", "Mounting filesystems"))
+	if (fstab && strcmp(fstab, "/etc/fstab"))
+		snprintf(cmd, sizeof(cmd), "mount -na -T %s", fstab);
+
+	if (run_interactive(cmd, "Mounting filesystems from %s", fstab))
 		plugin_run_hooks(HOOK_MOUNT_ERROR);

 	_d("Calling extra mount hook, after mount -a ...");
 	plugin_run_hooks(HOOK_MOUNT_POST);

-	if (whichp("swapon"))
-		run("swapon -ea", "swapon");
+	_d("Enable any swap ...");
+	fs_swapon(cmd, sizeof(cmd));

 	_d("Finalize, ensure common file systems are available ...");
 	fs_finalize();
@@ -438,11 +570,12 @@ static void crank_worker(void *unused)
 */
 static void bootstrap_worker(void *work)
 {
-	static int cnt = 120;
 	static struct wq final = {
 		.cb = finalize,
 		.delay = 10
 	};
+	static int cnt = 120;
+	int level = cfglevel;

 	_d("Step all services ...");
 	service_step_all(SVC_TYPE_ANY);
@@ -467,11 +600,18 @@ static void bootstrap_worker(void *work)
 	if (runparts && fisdir(runparts) && !rescue)
 		run_parts(runparts, NULL);

+
 	/*
-	 * Start all tasks/services in the configured runlevel
+	 * Start all tasks/services in the configured runlevel, or jump
+	 * into the runlevel selected from the command line.
 	 */
-	_d("Change to default runlevel(%d), starting all services ...", cfglevel);
-	service_runlevel(cfglevel);
+	if (cmdlevel) {
+		_d("Runlevel %d requested from command line, starting all services ...", cmdlevel);
+		level = cmdlevel;
+	} else
+		_d("Change to default runlevel(%d), starting all services ...", cfglevel);
+
+	service_runlevel(level);
 }

 static int version(int rc)
@@ -570,7 +710,7 @@ int main(int argc, char *argv[])
 	};
 	uev_ctx_t loop;

-	/* telinit or stand-alone process monitor */
+	/* user calling telinit or init */
 	if (getpid() != 1)
 		return telinit(argc, argv);

@@ -581,12 +721,12 @@ int main(int argc, char *argv[])

 	/*
 	 * Parse /proc/cmdline (debug, rescue, console=, etc.)
-	 * Also calls log_init() to set correct log level
 	 */
 	conf_parse_cmdline(argc, argv);

 	/*
-	 * Figure out system console(s)
+	 * Figure out system console(s) and call log_init() to set
+	 * correct log level, possibly finit.debug enabled.
 	 */
 	console_init();

@@ -599,10 +739,7 @@ int main(int argc, char *argv[])
 	/*
 	 * Set PATH, SHELL, and PWD early to something sane
 	 */
-	setenv("PATH", _PATH_STDPATH, 1);
-	setenv("SHELL", _PATH_BSHELL, 1);
-	setenv("LOGNAME", "root", 1);
-	setenv("USER", "root", 1);
+	conf_reset_env();

 	if (chdir("/"))
 		_pe("Failed cd /");
@@ -610,21 +747,8 @@ int main(int argc, char *argv[])
 	/*
 	 * In case of emergency.
 	 */
-	if (rescue) {
-		char *sulogin[] = {
-			_PATH_SULOGIN,
-			"sulogin",
-		};
-		size_t i;
-
-		for (i = 0; i < NELEMS(sulogin); i++) {
-			if (systemf(sulogin[i]))
-				continue;
-
-			rescue = 0;
-			break;
-		}
-	}
+	if (rescue)
+		rescue = sulogin(0);

 	/*
 	 * Load plugins early, the first hook is in banner(), so we
@@ -653,7 +777,10 @@ int main(int argc, char *argv[])
 	 */
 	cgroup_init(&loop);

-	/* Check and mount filesystems. */
+	/*
+	 * Check custom fstab from cmdline, including fallback, then run
+	 * fsck before mounting all filesystems, on error call sulogin.
+	 */
 	fs_mount_all();

 	/* Bootstrap conditions, needed for hooks */
@@ -676,7 +803,7 @@ int main(int argc, char *argv[])
 	 */
 	if (whichp(FINIT_LIBPATH_ "/watchdogd") && fexist(WDT_DEVNODE)) {
 		service_register(SVC_TYPE_SERVICE, "[123456789] cgroup.init name:watchdog :finit " FINIT_LIBPATH_ "/watchdogd -- Finit watchdog daemon", global_rlimit, NULL);
-		wdog = svc_find_by_nameid("watchdog", "finit");
+		wdog = svc_find("watchdog", "finit");
 	}

 	/*
@@ -1,7 +1,7 @@
 /* Finit - Fast /sbin/init replacement w/ I/O, hook & service plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -110,16 +110,18 @@ struct init_request {

 extern int    runlevel;
 extern int    cfglevel;
+extern int    cmdlevel;
 extern int    prevlevel;
 extern int    debug;
 extern int    rescue;
 extern int    single;
 extern int    bootstrap;
 extern int    kerndebug;
-extern char  *rcsd;
+extern char  *fstab;
 extern char  *sdown;
 extern char  *network;
 extern char  *hostname;
+extern char  *rcsd;
 extern char  *runparts;
 extern char  *osheading;
 extern uev_ctx_t *ctx;
@@ -1,6 +1,6 @@
 /* Initialize and serve a login terminal
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 * THE SOFTWARE.
 */

-#include "config.h"
+#include "config.h"		/* Generated by configure script */

 #include <err.h>
 #include <errno.h>
@@ -1,7 +1,7 @@
 /* Misc. utility functions for finit and its plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>		/* isblank() */
 #include <errno.h>
 #include <grp.h>
@@ -81,7 +83,7 @@ char *console(void)

 void console_init(void)
 {
-	ttinit();
+	log_init();
 }

 ssize_t cprintf(const char *fmt, ...)
@@ -100,6 +102,17 @@ ssize_t cprintf(const char *fmt, ...)
 	return size;
 }

+void tabstospaces(char *line)
+{
+	if (!line)
+		return;
+
+	for (int i = 0; line[i]; i++) {
+		if (line[i] == '\t')
+			line[i] = ' ';
+	}
+}
+
 char *strip_line(char *line)
 {
 	char *ptr;
@@ -500,20 +513,25 @@ void networking(int updown)
 	if (fexist("/etc/network/interfaces")) {
 		pid_t pid;

-		if (!updown) {
-			run_interactive("ifdown -a", "Stopping networking");
-			goto done;
-		}
-
 		pid = fork();
 		if (pid == 0) {
 			int rc = EX_OSERR;
+			const char *cmd;
 			FILE *pp;

 			setsid();
 			sig_unblock();

-			pp = popen("ifup -a 2>&1", "r");
+			if (updown)
+				cmd = "ifup -a 2>&1";
+			else if (whichp("ifquery"))
+				/* Regular ifodwn supports --force but not -f */
+				cmd = "ifdown -a --force 2>&1";
+			else
+				/* Busybox ifdown support -f, but not --force */
+				cmd = "ifdown -a -f 2>&1";
+
+			pp = popen(cmd, "r");
 			if (pp) {
 				char buf[256];

@@ -526,7 +544,8 @@ void networking(int updown)
 			_exit(rc);
 		}
 		cgroup_service("network", pid, NULL);
-		print(pid > 0 ? 0 : 1, "Bringing up network interfaces ...");
+		print(pid > 0 ? 0 : 1, "%s network interfaces ...",
+		      updown ? "Bringing up" : "Taking down");

 		goto done;
 	}
@@ -581,48 +600,6 @@ int in_container(void)
 	return 0;
 }

-#ifndef HAVE_GETFSENT
-static lfile_t *fstab = NULL;
-
-int setfsent(void)
-{
-	if (fstab)
-		lfclose(fstab);
-
-	fstab = lfopen("/etc/fstab", " \t\n");
-	if (!fstab)
-		return 0;
-
-	return 1;
-}
-
-struct fstab *getfsent(void)
-{
-	static struct fstab fs;
-
-	fs.fs_spec    = lftok(fstab);
-	if (fs.fs_spec == NULL)
-		return NULL;
-
-	fs.fs_file    = lftok(fstab);
-	fs.fs_vfstype = lftok(fstab);
-	fs.fs_mntops  = lftok(fstab);
-	fs.fs_type    = "rw";
-	fs.fs_freq    = atoi(lftok(fstab) ?: "0");
-	fs.fs_passno  = atoi(lftok(fstab) ?: "0");
-
-	return &fs;
-}
-
-void endfsent(void)
-{
-	if (fstab)
-		lfclose(fstab);
-
-	fstab = NULL;
-}
-#endif	/* HAVE_GETFSENT */
-
 /**
 * Local Variables:
 *  indent-tabs-mode: t
@@ -1,7 +1,7 @@
 /* Misc. utility functions and C-library extensions for finit and its plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -25,8 +25,6 @@
 #ifndef FINIT_HELPERS_H_
 #define FINIT_HELPERS_H_

-#include <mntent.h>
-#include <sched.h>		/* sched_yield() */
 #include <stdarg.h>
 #include <sys/resource.h>
 #include <sys/types.h>
@@ -47,26 +45,11 @@ typedef enum {
 	PROGRESS_MODERN,
 } pstyle_t;

-#ifndef HAVE_GETFSENT
-struct fstab {
-	char       *fs_spec;       /* block device name */
-	char       *fs_file;       /* mount point */
-	char       *fs_vfstype;    /* file-system type */
-	char       *fs_mntops;     /* mount options */
-	const char *fs_type;       /* rw/rq/ro/sw/xx option */
-	int         fs_freq;       /* dump frequency, in days */
-	int         fs_passno;     /* pass number on parallel dump */
-};
-
-int           setfsent  (void);
-void          endfsent  (void);
-struct fstab *getfsent  (void);
-#endif	/* HAVE_GETFSENT */
-
 char   *console         (void);
 void    console_init    (void);
-ssize_t cprintf         (const char *fmt, ...);
+ssize_t cprintf         (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));

+void    tabstospaces    (char *line);
 char   *strip_line      (char *line);

 void    enable_progress (int onoff);
@@ -79,7 +62,7 @@ void    stty            (int fd, speed_t speed);

 void    print_banner    (const char *heading);
 void    printv          (const char *fmt, va_list ap);
-void    print           (int action, const char *fmt, ...);
+void    print           (int action, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 void    print_desc      (char *action, char *desc);
 int     print_result    (int fail);

@@ -97,7 +80,7 @@ int     in_container    (void);

 int     complete        (char *cmd, int pid);
 int     run             (char *cmd, char *log);
-int     run_interactive (char *cmd, char *fmt, ...);
+int     run_interactive (char *cmd, char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 int     exec_runtask    (char *cmd, char *args[]);
 pid_t   run_getty       (char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[]);
 pid_t   run_sh          (char *tty, int noclear, int nowait, struct rlimit rlimit[]);
@@ -1,6 +1,6 @@
 /* New client tool, replaces old /dev/initctl API and telinit tool
 *
- * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2015-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@

 #include "config.h"

-#include <err.h>
 #include <ftw.h>
 #include <ctype.h>
 #include <getopt.h>
@@ -39,6 +38,7 @@
 # include <lite/lite.h>
 #endif

+#include "initctl.h"
 #include "client.h"
 #include "cond.h"
 #include "serv.h"
@@ -154,12 +154,19 @@ static int toggle_debug(char *arg)
 	return client_send(&rq, sizeof(rq));
 }

-static int do_log(char *svc)
+static int do_log(svc_t *svc, char *tail)
 {
-	char *logfile = "/var/log/syslog";
+	const char *logfile = "/var/log/syslog";
+	pid_t pid;
+	char *nm;

-	if (!svc || !svc[0])
-		svc = "finit";
+	if (svc) {
+		nm = svc_ident(svc, NULL, 0);
+		pid = svc->pid;
+	} else {
+		nm  = "finit";
+		pid = 1;
+	}

 	if (!fexist(logfile)) {
 		logfile = "/var/log/messages";
@@ -167,7 +174,20 @@ static int do_log(char *svc)
 			return 0; /* bail out, maybe in container */
 	}

-	return systemf("cat %s | grep %s | tail -10", logfile, svc);
+	return systemf("cat %s | grep '\\[%d\\]\\|%s' %s", logfile, pid, nm, tail);
+}
+
+static int show_log(char *arg)
+{
+	svc_t *svc = NULL;
+
+	if (arg) {
+		svc = client_svc_find(arg);
+		if (!svc)
+			ERRX(69, "no such task or service(s): %s", arg);
+	}
+
+	return do_log(svc, "");
 }

 static int do_runlevel(char *arg)
@@ -229,20 +249,11 @@ static int do_startstop(int cmd, char *arg)
 	};

 	if (!arg || !arg[0])
-		errx(1, "missing argument to %s", (cmd == INIT_CMD_START_SVC
-						   ? "start"
-						   : (cmd == INIT_CMD_STOP_SVC
-						      ? "stop"
-						      : "restart")));
+		ERRX(2, "missing command argument");

 	strlcpy(rq.data, arg, sizeof(rq.data));
-	if (client_send(&rq, sizeof(rq))) {
-		fprintf(stderr, "No such task or service(s): %s\n\n", arg);
-		fprintf(stderr, "Usage: initctl %s <NAME>[:ID]\n",
-			cmd == INIT_CMD_START_SVC ? "start" :
-			(cmd == INIT_CMD_STOP_SVC ? "stop"  : "restart"));
-		return 1;
-	}
+	if (client_send(&rq, sizeof(rq)))
+		ERRX(69, "no such task or service(s): %s", arg);

 	return do_svc(cmd, arg);
 }
@@ -274,7 +285,7 @@ static int do_restart(char *arg)
 	}

 	if (retries == 0)
-		errx(1, "Failed stopping %s (restart)", arg);
+		ERRX(7, "failed stopping %s (restart)", arg);

 	return do_startstop(INIT_CMD_RESTART_SVC, arg);
 }
@@ -298,27 +309,19 @@ int do_signal(int argc, char *argv[])
 	int signo;

 	if (argc != 2)
-		errx(1, "invalid number of arguments to signal");
+		ERRX(2, "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;
-	}
+	if (client_send(&rq, sizeof(rq)))
+		ERRX(69, "no such task or service(s): %s", argv[0]);

-	/* 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);
+		const char *errstr = NULL;

-		/* 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;
-		}
+		signo = (int)strtonum(argv[1], 1, 31, &errstr);
+		if (errstr)
+			ERRX(65, "%s signal: %s", errstr, argv[1]);
 	}

 	/* Reuse runlevel for signal number. */
@@ -328,10 +331,6 @@ int do_signal(int argc, char *argv[])
 	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)
@@ -384,44 +383,62 @@ static int do_cond_dump(char *arg)
 	}

 	if (nftw(_PATH_COND, dump_one_cond, 20, 0) == -1) {
-		warnx("Failed parsing %s", _PATH_COND);
+		WARNX("Failed parsing %s", _PATH_COND);
 		return 1;
 	}

 	return 0;
 }

-static int do_cond_act(char *arg, int creat)
+typedef enum { COND_CLR, COND_SET, COND_GET } condop_t;
+
+static int do_cond_act(char *arg, condop_t op)
 {
-	char oneshot[256];
+	char path[256];
 	size_t off;

 	if (arg && strncmp(arg, COND_USR, strlen(COND_USR)) == 0)
 		arg += strlen(COND_USR);

 	if (!arg || !arg[0])
-		errx(1, "Invalid condition (empty)");
-	if (strchr(arg, '/'))
-		errx(1, "Invalid condition (slashes)");
-	if (strchr(arg, '.'))
-		errx(1, "Invalid condition (periods)");
+		ERRX(2, "Invalid condition (empty)");

-	snprintf(oneshot, sizeof(oneshot), _PATH_CONDUSR "%s", arg);
+	/* allowed to read any condition, but not set/clr */
+	if (op != COND_GET) {
+		if (strchr(arg, '/'))
+			ERRX(2, "Invalid condition (slashes)");
+		if (strchr(arg, '.'))
+			ERRX(2, "Invalid condition (periods)");
+	}
+
+	if (strchr(arg, '/'))
+		snprintf(path, sizeof(path), _PATH_COND "%s", arg);
+	else
+		snprintf(path, sizeof(path), _PATH_CONDUSR "%s", arg);
 	off = strlen(_PATH_COND);

-	if (creat) {
-		if (symlink(_PATH_RECONF, oneshot) && errno != EEXIST)
-			err(1, "Failed asserting condition <%s>", &oneshot[off]);
-	} else {
-		if (erase(oneshot) && errno != ENOENT)
-			err(1, "Failed deasserting condition <%s>", &oneshot[off]);
+	switch (op) {
+	case COND_GET:
+		off = !fexist(path);
+		if (verbose)
+			puts(off ? "off" : "on");
+		return off;
+	case COND_SET:
+		if (symlink(_PATH_RECONF, path) && errno != EEXIST)
+			ERR(73, "Failed asserting condition <%s>", &path[off]);
+		break;
+	case COND_CLR:
+		if (erase(path) && errno != ENOENT)
+			ERR(73, "Failed deasserting condition <%s>", &path[off]);
+		break;
 	}

 	return 0;
 }

-static int do_cond_set(char *arg) { return do_cond_act(arg, 1); }
-static int do_cond_clr(char *arg) { return do_cond_act(arg, 0); }
+static int do_cond_get(char *arg) { return do_cond_act(arg, COND_GET); }
+static int do_cond_set(char *arg) { return do_cond_act(arg, COND_SET); }
+static int do_cond_clr(char *arg) { return do_cond_act(arg, COND_CLR); }

 static char *svc_cond(svc_t *svc, char *buf, size_t len)
 {
@@ -664,6 +681,13 @@ static char *svc_command(svc_t *svc, char *buf, size_t len)
 		strlcat(buf, svc->args[i], len);
 	}

+	if (svc_is_sysv(svc)) {
+		char *cmd = svc->state == SVC_HALTED_STATE ? "stop" : "start";
+
+		strlcat(buf, " ", len);
+		strlcat(buf, cmd, len);
+	}
+
 	strlcat(buf, bold ? "\e[0m" : "", len);

 	return buf;
@@ -792,7 +816,7 @@ static int show_status(char *arg)

 		svc = client_svc_find(arg);
 		if (!svc)
-			return 255;
+			ERRX(69, "no such task or service(s): %s", arg);

 		if (quiet) {
 			if (svc_is_runtask(svc))
@@ -845,7 +869,7 @@ static int show_status(char *arg)
 	no_cgroup:
 		printf("\n");

-		return do_log(svc->cmd);
+		return do_log(svc, "| tail -10");
 	}

 	col_widths();
@@ -955,13 +979,13 @@ static int usage(int rc)
 		"  -b, --batch               Batch mode, no screen size probing\n"
 		"  -c, --create              Create missing paths (and files) as needed\n"
 		"  -f, --force               Ignore missing files and arguments, never prompt\n"
+		"  -h, --help                This help text\n"
 		"  -1, --once                Only one lap in commands like 'top'\n"
 		"  -p, --plain               Use plain table headings, no ctrl chars\n"
 		"  -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"
@@ -990,15 +1014,15 @@ 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");

 	fprintf(stderr,
-//		"  reload   <NAME>[:ID]      Reload (SIGHUP) service by name\n"  
 		"\n"
 		"  cond     set   <COND>     Set (assert) user-defined condition     +usr/COND\n"
+		"  cond     get   <COND>     Get status of user-defined condition, see $? and -v\n"
 		"  cond     clear <COND>     Clear (deassert) user-defined condition -usr/COND\n"
 		"  cond     status           Show condition status, default cond command\n"
 		"  cond     dump             Dump all conditions and their status\n"
@@ -1006,7 +1030,9 @@ static int usage(int rc)
 		"  log      [NAME]           Show ten last Finit, or NAME, messages from syslog\n"
 		"  start    <NAME>[:ID]      Start service by name, with optional ID\n"
 		"  stop     <NAME>[:ID]      Stop/Pause a running service by name\n"
-		"  reload   <NAME>[:ID]      Reload service by name (SIGHUP or restart)\n"
+		"  reload   <NAME>[:ID]      Reload service as if .conf changed (SIGHUP or restart)\n"
+		"                            This allows restart of run/tasks that have already run\n"
+		"                            Note: Finit .conf file(s) are *not* reloaded!\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"
@@ -1088,7 +1114,7 @@ static int cmd_parse(int argc, char *argv[], struct cmd *command)
 	}

 	if (argv[0] && strlen(argv[0]) > 0)
-		errx(1, "No such command.  See 'initctl help' for an overview of available commands.");
+		ERRX(3, "No such command.  See 'initctl help' for an overview of available commands.");

 	return command[0].cb(NULL); /* default cmd */
 }
@@ -1113,6 +1139,7 @@ int main(int argc, char *argv[])
 		{ "status",   NULL, do_cond_show, NULL, NULL }, /* default cmd */
 		{ "dump",     NULL, do_cond_dump, NULL, NULL  },
 		{ "set",      NULL, do_cond_set,  NULL, NULL  },
+		{ "get",      NULL, do_cond_get,  NULL, NULL  },
 		{ "clr",      NULL, do_cond_clr,  NULL, NULL  },
 		{ "clear",    NULL, do_cond_clr,  NULL, NULL  },
 		{ NULL, NULL, NULL, NULL, NULL  }
@@ -1139,7 +1166,7 @@ int main(int argc, char *argv[])

 		{ "cond",     cond, NULL, NULL, NULL          },

-		{ "log",      NULL, do_log,       NULL, NULL  },
+		{ "log",      NULL, show_log,     NULL, NULL  },
 		{ "start",    NULL, do_start,     NULL, NULL  },
 		{ "stop",     NULL, do_stop,      NULL, NULL  },
 		{ "restart",  NULL, do_restart,   NULL, NULL  },
@@ -1224,6 +1251,9 @@ void logit(int prio, const char *fmt, ...)
 {
 	va_list ap;

+	if (quiet)
+		return;
+
 	va_start(ap, fmt);
 	if (prio <= LOG_ERR)
 		verrx(1, fmt, ap);
@@ -1,6 +1,6 @@
 /* New client tool, replaces old /dev/initctl API and telinit tool
 *
- * Copyright (c) 2015-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2015-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,8 @@
 #ifndef FINIT_INITCTL_H_
 #define FINIT_INITCTL_H_

+#include <err.h>
+
 #include "finit.h"
 #include "util.h"

@@ -33,8 +35,14 @@ extern int ionce;			/* initctl -1 */
 extern int heading;			/* initctl -t */
 extern int verbose;			/* initctl -v */
 extern int plain;			/* initctl -p */
+extern int quiet;			/* initctl -q */

-extern void print_header(const char *fmt, ...);
+#define ERR(rc, fmt, args...)  do { if (!quiet) err(rc, fmt, ##args);  else exit(rc); } while (0)
+#define ERRX(rc, fmt, args...) do { if (!quiet) errx(rc, fmt, ##args); else exit(rc); } while (0)
+#define WARN(fmt, args...)     do { if (!quiet) warn(fmt, ##args);  } while (0)
+#define WARNX(fmt, args...)    do { if (!quiet) warnx(fmt, ##args); } while (0)
+
+extern void print_header(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));

 #endif /* FINIT_INITCTL_H_ */

@@ -1,7 +1,7 @@
 /* inotify watcher for files or directories
 *
 * Copyright (c) 2015-2016  Tobias Waldekranz <tobias@waldekranz.com>
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -62,8 +62,10 @@ int iwatch_init(struct iwatch *iw)
 	 * 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));
+	if (!getsockopt(iw->fd, SOL_SOCKET, SO_RCVBUF, &sz, &len)) {
+		if (setsockopt(iw->fd, SOL_SOCKET, SO_RCVBUF, &sz, sizeof(sz)))
+			_pe("Failed increasing size of inotify socket");
+	}

 	initialized = 1;

@@ -1,7 +1,7 @@
 /* inotify watcher for files or directories
 *
 * Copyright (c) 2015-2016  Tobias Waldekranz <tobias@waldekranz.com>
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Listens to kernel events like AC power status and manages sys/ conditions
 *
- * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2021-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <poll.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -52,6 +53,10 @@
 static int num_ac_online;
 static int num_ac;

+static int running = 1;
+static int level;
+static int logon;
+
 int debug;			/* debug in other modules as well */

 void logit(int prio, const char *fmt, ...)
@@ -59,9 +64,9 @@ void logit(int prio, const char *fmt, ...)
 	va_list ap;

 	va_start(ap, fmt);
-	if (!debug)
+	if (logon)
 		vsyslog(prio, fmt, ap);
-	else {
+	else if (prio <= level) {
 		vfprintf(stderr, fmt, ap);
 		fprintf(stderr, "\n");
 	}
@@ -179,6 +184,26 @@ static void init(void)
 		sys_cond("pwr/ac", 1);
 }

+static void set_logging(int prio)
+{
+	setlogmask(LOG_UPTO(prio));
+	level = prio;
+}
+
+static void toggle_debug(int signo)
+{
+	(void)signo;
+
+	debug ^= 1;
+	set_logging(debug ? LOG_DEBUG : LOG_NOTICE);
+}
+
+static void shut_down(int signo)
+{
+	(void)signo;
+	running = 0;
+}
+
 /*
 * Started by Finit as soon as possible when base filesystem is up,
 * modules have been probed, or insmodded from /etc/finit.conf, so by
@@ -198,10 +223,13 @@ int main(int argc, char *argv[])
 	}

 	if (!debug) {
-		openlog("keventd", LOG_CONS | LOG_PID, LOG_DAEMON);
-		setlogmask(LOG_UPTO(LOG_NOTICE));
+		openlog("keventd", LOG_PID, LOG_DAEMON);
+		set_logging(LOG_NOTICE);
+		logon = 1;
 	}

+	signal(SIGUSR1, toggle_debug);
+	signal(SIGTERM, shut_down);
 	init();

 	pfd.events = POLLIN;
@@ -216,11 +244,18 @@ int main(int argc, char *argv[])
 		panic("bind failed");

 	logit(LOG_DEBUG, "Waiting for events ...");
-	while (-1 != poll(&pfd, 1, -1)) {
+	while (running) {
 		char *path = NULL;
 		int ac = 0;
 		int i, len;

+		if (-1 == poll(&pfd, 1, -1)) {
+			if (errno == EINTR)
+				continue;
+
+			break;
+		}
+
 		len = recv(pfd.fd, buf, sizeof(buf), MSG_DONTWAIT);
 		if (len == -1) {
 			switch (errno) {
@@ -235,6 +270,7 @@ int main(int argc, char *argv[])
 			}
 		}
 		buf[len] = 0;
+		logit(LOG_DEBUG, "%s", buf);

 		/* skip libusb events, focus on kernel events/changes */
 		if (strncmp(buf, "change@", 7))
@@ -1,6 +1,6 @@
 /* Finit daemon log functions
 *
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,8 @@
 * THE SOFTWARE.
 */

-#include "config.h"
+#include "config.h"		/* Generated by configure script */
+
 #include <stdio.h>
 #include <stdarg.h>
 #ifdef _LIBITE_LITE
@@ -40,6 +41,8 @@ static int loglevel = LOG_INFO;

 void log_init(void)
 {
+	ttinit();
+
 	if (debug)
 		loglevel = LOG_DEBUG;
 	else
@@ -72,24 +75,25 @@ static int log_open(void)
 	if (debug)
 		opts |= LOG_PERROR;

-	closelog();
 	openlog("finit", opts, LOG_DAEMON);
 	setlogmask(LOG_UPTO(loglevel));

 	return up = 1;
 }

+static void log_close(void)
+{
+	closelog();
+	up = 0;
+}
+
 /* Toggle debug mode */
 void log_debug(void)
 {
 	debug = !debug;

-	if (debug) {
-		loglevel = LOG_DEBUG;
-	} else {
-		loglevel = LOG_NOTICE;
-		ttinit();
-	}
+	log_close();
+	log_init();
 	log_open();

 	logit(LOG_NOTICE, "Debug mode %s", debug ? "enabled" : "disabled");
@@ -1,6 +1,6 @@
 /* Finit daemon log functions
 *
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -43,14 +43,14 @@
 #define  _d(fmt, args...) logit(LOG_DEBUG,   "%s():" fmt, __func__, ##args)
 #define  _w(fmt, args...) logit(LOG_WARNING, "%s():" fmt, __func__, ##args)
 #define  _e(fmt, args...) logit(LOG_ERR,     "%s():" fmt, __func__, ##args)
-#define _pe(fmt, args...) logit(LOG_ERR,     "%s():" fmt ": %n", __func__, ##args, strerror(errno))
+#define _pe(fmt, args...) logit(LOG_ERR,     "%s():" fmt ": %s", __func__, ##args, strerror(errno))

 void    log_init        (void);
 void    log_exit        (void);

 void    log_debug       (void);

-void    logit           (int prio, const char *fmt, ...);
-void    flog            (char *file, const char *fmt, ...);
+void    logit           (int prio, const char *fmt, ...)   __attribute__ ((format (printf, 2, 3)));
+void    flog            (char *file, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));

 #endif /* FINIT_LOG_H_ */
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2018-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2018-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Handle MD arrays
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <glob.h>
 #include <stdio.h>
 #include <string.h>
@@ -1,6 +1,6 @@
 /* Mount and unmount helpers
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,10 +21,17 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
+#include <errno.h>
 #include <string.h>
+#ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <sys/mount.h>

+#include "helpers.h"
+
 /*
 * SysV init on Debian/Ubuntu skips these protected mount points
 *
@@ -65,12 +72,12 @@ static void iterator_end(FILE **fp)
 	*fp = NULL;
 }

-static struct mntent *iterator(char *fstab, FILE **fp)
+static struct mntent *iterator(char *filename, FILE **fp)
 {
 	static struct mntent *mnt;

-	if (!*fp && fstab) {
-		*fp = setmntent(fstab, "r");
+	if (!*fp && filename) {
+		*fp = setmntent(filename, "r");
 		if (!*fp)
 			return NULL;
 	}
@@ -86,13 +93,28 @@ static struct mntent *iterator(char *fstab, FILE **fp)
 	return NULL;
 }

+static int unmount(const char *target)
+{
+	int rc;
+
+	rc = umount(target);
+	if (rc) {
+		if (errno != EBUSY)
+			print(2, "Failed unmounting %s, error %d: %s", target, errno, strerror(errno));
+		return rc;
+	}
+	print(0, "Unmounting %s", target);
+
+	return 0;
+}
+
 void unmount_tmpfs(void)
 {
 	struct mntent *mnt;
 	FILE *fp = NULL;

 	while ((mnt = iterator("/proc/mounts", &fp))) {
-		if (!strcmp("tmpfs", mnt->mnt_fsname) && !umount(mnt->mnt_dir))
+		if (!strcmp("tmpfs", mnt->mnt_fsname) && !unmount(mnt->mnt_dir))
 			iterator_end(&fp);  /* Restart iteration */
 	}
 }
@@ -103,7 +125,7 @@ void unmount_regular(void)
 	FILE *fp = NULL;

 	while ((mnt = iterator("/proc/mounts", &fp))) {
-		if (!umount(mnt->mnt_dir))
+		if (!unmount(mnt->mnt_dir))
 			iterator_end(&fp);  /* Restart iteration */
 	}
 }
@@ -1,7 +1,7 @@
 /* PID and PID file helpers
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <errno.h>
 #include <paths.h>
 #include <stdio.h>
@@ -69,10 +71,11 @@ int pid_alive(pid_t pid)
 */
 char *pid_get_name(pid_t pid, char *name, size_t len)
 {
+	static char line[64];
+	char *pname = NULL;
+	char path[32];
 	int ret = 1;
 	FILE *fp;
-	char *pname, path[32];
-	static char line[64];

 	snprintf(path, sizeof(path), "/proc/%d/status", pid);
 	fp = fopen(path, "r");
@@ -113,8 +116,8 @@ char *pid_file(svc_t *svc)
 pid_t pid_file_read(const char *fn)
 {
 	pid_t pid = 0;
-	FILE *fp;
 	char buf[42];
+	FILE *fp;

 	fp = fopen(fn, "r");
 	if (!fp)
@@ -157,6 +160,11 @@ int pid_file_set(svc_t *svc, char *file, int not)
 		file++;
 	}

+	if (svc_is_forking(svc) && !not) {
+		logit(LOG_WARNING, "Service %s is forking, adjusting to pid:!%s", svc->name, file);
+		not = 1;
+	}
+
 	pid_runpath(file, &svc->pidfile[not], sizeof(svc->pidfile) - not);
 	if (not)
 		svc->pidfile[0] = '!';
@@ -199,8 +207,8 @@ int pid_file_parse(svc_t *svc, char *arg)

 	/* 'pid:' implies argument following*/
 	if (!strncmp(arg, "pid:", 4)) {
-		int len, not = 0;
 		char path[MAX_ARG_LEN];
+		int len, not = 0;

 		arg += 4;
 		if ((arg[0] == '!' && arg[1] == '/') || arg[0] == '/')
@@ -1,7 +1,7 @@
 /* PID and PID file helpers
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Plugin based services architecture for finit
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <errno.h>
 #include <dlfcn.h>		/* dlopen() et al */
 #include <dirent.h>		/* readdir() et al */
@@ -34,7 +36,6 @@
 # include <lite/queue.h>	/* BSD sys/queue.h API */
 #endif

-#include "config.h"
 #include "cond.h"
 #include "finit.h"
 #include "helpers.h"
@@ -1,6 +1,6 @@
 /* Plugin based services architecture for finit
 *
- * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,7 +1,7 @@
 /* Private header file for main finit daemon, not for plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* reboot, halt, poweroff, shutdown, suspend for finit
 *
- * Copyright (c) 2009-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2009-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 #include <getopt.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include "util.h"
@@ -159,7 +160,13 @@ int reboot_main(int argc, char *argv[])
 	/* Check for any overrides */
 	transform(NULL);

+	/* Check if we're in sulogin shell */
+	if (getenv("SULOGIN"))
+		force = 1;
+
 	if (force) {
+		sync();
+
 		switch (cmd) {
 		case CMD_REBOOT:
 			c = reboot(RB_AUTOBOOT);
@@ -174,9 +181,9 @@ int reboot_main(int argc, char *argv[])
 			break;

 		case CMD_SUSPEND:
-			c = reboot(RB_SW_SUSPEND);
+			c = suspend();
 			if (c && errno == EINVAL)
-				errx(1, "Kernel does not support suspend.");
+				errx(1, "Kernel does not support suspend to RAM.");
 			break;

 		case CMD_UNKNOWN:
@@ -1,6 +1,6 @@
 /* Work queue helper functions
 *
- * Copyright (c) 2018-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2018-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Work queue helper functions
 *
- * Copyright (c) 2018-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2018-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* List and enable/disable service configurations
 *
- * Copyright (c) 2017-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2017-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,6 @@

 #include "config.h"

-#include <err.h>
 #include <fcntl.h> /* Definition of AT_* constants */
 #include <glob.h>
 #include <stdio.h>
@@ -34,9 +33,24 @@
 # include <lite/lite.h>
 #endif

+#include "client.h"
 #include "initctl.h"


+static int is_builtin(char *arg)
+{
+	svc_t *svc;
+
+	svc = client_svc_find(arg);
+	if (!svc)
+		return 0;
+
+	if (svc->file[0])
+		return 0;
+
+	return 1;
+}
+
 static int calc_width(char *arr[], size_t len)
 {
 	int width = 0;
@@ -218,7 +232,7 @@ int serv_enable(char *arg)
 	int ena;

 	if (!arg || !arg[0]) {
-		warnx("missing argument to enable, may be one of:");
+		WARNX("missing argument to enable, may be one of:");
 		return serv_list("available");
 	}

@@ -228,18 +242,18 @@ int serv_enable(char *arg)
 	}

 	if (chdir(FINIT_RCSD))
-		err(1, "failed cd %s", FINIT_RCSD);
+		ERR(72, "failed cd %s", FINIT_RCSD);

 	if (icreate && mkdir("enabled", 0755) && EEXIST != errno)
-		err(1, "failed creating %s/enabled directory", FINIT_RCSD);
+		ERR(73, "failed creating %s/enabled directory", FINIT_RCSD);
 	ena = !chdir("enabled");   /* System *may* have enabled/ dir. */

 	snprintf(path, sizeof(path), "%savailable/%s", ena ? "../" : "", arg);
 	if (!fexist(path))
-		errx(1, "cannot find %s", conf(path, sizeof(path), arg, 0));
+		ERRX(72, "cannot find %s", conf(path, sizeof(path), arg, 0));

 	if (fexist(arg))
-		errx(1, "%s already enabled", arg);
+		ERRX(1, "%s already enabled", arg);

 	return symlink(path, arg) != 0;
 }
@@ -250,7 +264,7 @@ int do_disable(char *arg, int check)
 	char corr[40];

 	if (!arg || !arg[0]) {
-		warnx("missing argument to disable, may be one of:");
+		WARNX("missing argument to disable, may be one of:");
 		return serv_list("enabled");
 	}

@@ -260,15 +274,15 @@ int do_disable(char *arg, int check)
 	}

 	if (chdir(FINIT_RCSD))
-		err(1, "failed cd %s", FINIT_RCSD);
+		ERR(72, "failed cd %s", FINIT_RCSD);
 	if (chdir("enabled"))	   /* System *may* have enabled/ dir. */
 		dbg("Failed changing to %s/enabled/: %s", FINIT_RCSD, strerror(errno));

 	if (check && stat(arg, &st))
-		errx(1, "%s not (an) enabled (service).", arg);
+		ERRX(6, "%s not (an) enabled (service).", arg);

 	if (check && (st.st_mode & S_IFMT) == S_IFLNK)
-		errx(1, "cannot disable %s, not a symlink.", arg);
+		ERRX(1, "cannot disable %s, not a symlink.", arg);

 	return remove(arg) != 0;
 }
@@ -284,14 +298,16 @@ int serv_touch(char *arg)
 	char *fn;

 	if (!arg || !arg[0]) {
-		warnx("missing argument to touch, may be one of:");
+		WARNX("missing argument to touch, may be one of:");
 		return serv_list("enabled");
 	}

 	fn = conf(path, sizeof(path), arg, 0);
 	if (!fexist(fn)) {
 		if (!strstr(arg, "finit.conf"))
-			errx(1, "%s not available.", arg);
+			ERRX(72, "%s not available.", arg);
+		if (is_builtin(arg))
+			ERRX(4, "%s is a built-in service.", arg);

 		strlcpy(path, FINIT_CONF, sizeof(path));
 		fn = path;
@@ -299,7 +315,7 @@ int serv_touch(char *arg)

 	/* libite:touch() follows symlinks */
 	if (utimensat(AT_FDCWD, fn, NULL, AT_SYMLINK_NOFOLLOW))
-		err(1, "failed marking %s for reload", fn);
+		ERR(71, "failed marking %s for reload", fn);

 	return 0;
 }
@@ -311,7 +327,10 @@ int serv_show(char *arg)

 	fn = conf(path, sizeof(path), arg, 0);
 	if (!fexist(fn)) {
-		warnx("Cannot find %s", arg);
+		if (is_builtin(arg))
+			ERRX(4, "%s is a built-in service.", arg);
+
+		WARNX("Cannot find %s", arg);
 		return 1;
 	}

@@ -345,8 +364,11 @@ static int do_edit(char *arg, int creat)

 	fn = conf(path, sizeof(path), arg, creat);
 	if (!fexist(fn)) {
+		if (is_builtin(arg))
+			ERRX(4, "%s is a built-in service.", arg);
+
 		if (!creat) {
-			warnx("Cannot find %s, use -c flag, create command, or select one of:", arg);
+			WARNX("Cannot find %s, use -c flag, create command, or select one of:", arg);
 			return serv_list(NULL);
 		}

@@ -355,7 +377,7 @@ static int do_edit(char *arg, int creat)
 		copyfile(SAMPLE_CONF, fn, 0, 0);
 #endif
 	} else if (creat)
-		warnx("the file %s already exists, falling back to edit.", fn);
+		WARNX("the file %s already exists, falling back to edit.", fn);

 	for (size_t i = 0; i < NELEMS(editor); i++) {
 		if (systemf("%s %s 2>/dev/null", editor[i], path))
@@ -371,6 +393,7 @@ int serv_edit(char *arg)
 	if (!arg || !arg[0]) {
 		if (!yorn("Do you want to edit %s (y/N)? ", FINIT_CONF))
 			return 0;
+		arg = "";
 	}

 	return do_edit(arg, icreate);
@@ -383,7 +406,10 @@ int serv_creat(char *arg)
 	FILE *fp;

 	if (!arg || !arg[0])
-		errx(1, "missing argument to create");
+		ERRX(2, "missing argument to create");
+
+	if (is_builtin(arg))
+		ERRX(4, "%s is a built-in service.", arg);

 	/* Input from a pipe or a proper TTY? */
 	if (isatty(STDIN_FILENO))
@@ -392,16 +418,16 @@ int serv_creat(char *arg)
 	/* Open fn for writing from pipe */
 	fn = conf(buf, sizeof(buf), arg, 1);
 	if (!fn)
-		err(1, "failed creating conf %s", arg);
+		ERR(73, "failed creating conf %s", arg);

 	if (!icreate && fexist(fn)) {
-		warnx("%s already exists, skipping (use -c to override)", fn);
+		WARNX("%s already exists, skipping (use -c to override)", fn);
 		fn = "/dev/null";
 	}

 	fp = fopen(fn, "w");
 	if (!fp)
-		err(1, "failed opening %s for writing", fn);
+		ERR(73, "failed opening %s for writing", fn);

 	while (fgets(buf, sizeof(buf), stdin))
 		fputs(buf, fp);
@@ -415,21 +441,24 @@ int serv_delete(char *arg)
 	char *fn;

 	if (!arg || !arg[0]) {
-		warnx("missing argument to delete, may be one of:");
+		WARNX("missing argument to delete, may be one of:");
 		return serv_list("available");
 	}

 	fn = conf(buf, sizeof(buf), arg, 0);
-	if (!fn)
-		errx(1, FINIT_RCSD " missing on system.");
+	if (!fn) {
+		if (is_builtin(arg))
+			ERRX(4, "%s is a built-in service.", arg);
+		ERRX(72, FINIT_RCSD " missing on system.");
+	}

 	if (!fexist(fn))
-		warnx("cannot find %s", fn);
+		WARNX("cannot find %s", fn);

 	if (iforce || yorn("Remove file and symlink(s) to %s (y/N)? ", fn)) {
 		do_disable(arg, 0);
 		if (remove(fn))
-			err(1, "Failed removing %s", fn);
+			ERR(1, "Failed removing %s", fn);
 	}

 	return 0;
@@ -1,6 +1,6 @@
 /* List and enable/disable service configurations
 *
- * Copyright (c) 2017-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2017-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,7 +1,7 @@
 /* Finit service monitor, task starter and generic API for managing svc_t
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -25,6 +25,7 @@
 #include "config.h"		/* Generated by configure script */

 #include <ctype.h>		/* isblank() */
+#include <sched.h>		/* sched_yield() */
 #include <string.h>
 #include <sys/reboot.h>
 #include <sys/prctl.h>
@@ -89,7 +90,7 @@ static void service_timeout_cb(uev_t *w, void *arg, int events)
 * Returns:
 * POSIX OK(0) on success, non-zero on error.
 */
-static int service_timeout_after(svc_t *svc, int timeout, void (*cb)(svc_t *svc))
+int service_timeout_after(svc_t *svc, int timeout, void (*cb)(svc_t *svc))
 {
 	if (svc->timer_cb)
 		return -EBUSY;
@@ -107,7 +108,7 @@ static int service_timeout_after(svc_t *svc, int timeout, void (*cb)(svc_t *svc)
 * Returns:
 * POSIX OK(0) on success, non-zero on error.
 */
-static int service_timeout_cancel(svc_t *svc)
+int service_timeout_cancel(svc_t *svc)
 {
 	int err;

@@ -197,9 +198,10 @@ static int lredirect(svc_t *svc)

 	pid = fork();
 	if (pid == 0) {
-		int fds;
-		char *tag  = basename(svc->cmd);
 		char *prio = "daemon.info";
+		char buf[MAX_IDENT_LEN];
+		char *tag;
+		int fds;

 		sched_yield();

@@ -212,6 +214,9 @@ static int lredirect(svc_t *svc)
 		/* Reset signals */
 		sig_unblock();

+		/* Default syslog identity name[:id] */
+		tag = svc_ident(svc, buf, sizeof(buf));
+
 		if (!whichp(_PATH_LOGIT)) {
 			logit(LOG_INFO, _PATH_LOGIT " missing, using syslog for %s instead", svc->name);
 			fallback_logger(tag, prio);
@@ -381,6 +386,20 @@ static char *group_name(svc_t *svc, char *buf, size_t len)
 	return buf;
 }

+static void compose_cmdline(svc_t *svc, char *buf, size_t len)
+{
+	size_t i;
+
+	strlcpy(buf, svc->cmd, len);
+	for (i = 1; i < MAX_NUM_SVC_ARGS; i++) {
+		if (!strlen(svc->args[i]))
+			break;
+
+		strlcat(buf, " ", len);
+		strlcat(buf, svc->args[i], len);
+	}
+}
+
 static pid_t service_fork(svc_t *svc)
 {
 	pid_t pid;
@@ -401,20 +420,19 @@ static pid_t service_fork(svc_t *svc)
 		/* Set configured limits */
 		for (int i = 0; i < RLIMIT_NLIMITS; i++) {
 			if (setrlimit(i, &svc->rlimit[i]) == -1)
-				logit(LOG_WARNING,
-				      "%s: rlimit: Failed setting %s",
-				      svc->cmd, rlim2str(i));
+				logit(LOG_WARNING, "%s: rlimit: failed setting %s",
+				      svc_ident(svc, NULL, 0), rlim2str(i));
 		}

 		/* Set desired user+group */
 		if (gid >= 0) {
 			if (setgid(gid))
-				_pe("%s: failed setgid(%d)", svc->cmd, gid);
+				_pe("%s: failed setgid(%d)", svc_ident(svc, NULL, 0), gid);
 		}

 		if (uid >= 0) {
 			if (setuid(uid))
-				_pe("%s: failed setuid(%d)", svc->cmd, uid);
+				_pe("%s: failed setuid(%d)", svc_ident(svc, NULL, 0), uid);

 			/* Set default path for regular users */
 			if (uid > 0)
@@ -423,7 +441,7 @@ static pid_t service_fork(svc_t *svc)
 				setenv("HOME", home, 1);
 				if (chdir(home)) {
 					if (chdir("/"))
-						_pe("%s: failed chdir(%s) and chdir(/)", svc->cmd, home);
+						_pe("%s: failed chdir(%s) and chdir(/)", svc_ident(svc, NULL, 0), home);
 				}
 			}
 		}
@@ -445,6 +463,7 @@ static pid_t service_fork(svc_t *svc)
 static int service_start(svc_t *svc)
 {
 	int result = 0, do_progress = 1;
+	char cmdline[CMD_SIZE] = "";
 	sigset_t nmask, omask;
 	char grnam[80];
 	pid_t pid;
@@ -459,14 +478,14 @@ static int service_start(svc_t *svc)

 	/* Don't try and start service if it doesn't exist. */
 	if (!whichp(svc->cmd)) {
-		logit(LOG_WARNING, "%s: missing or not in $PATH", svc->cmd);
+		logit(LOG_WARNING, "%s: missing %s or not in $PATH", svc_ident(svc, NULL, 0), svc->cmd);
 		svc_missing(svc);
 		return 1;
 	}

 	/* Unlike systemd we do not allow starting service if env is missing, unless - */
 	if (!svc_checkenv(svc)) {
-		logit(LOG_WARNING, "%s: missing env file %s", svc->cmd, svc->env);
+		logit(LOG_WARNING, "%s: missing %s env file %s", svc_ident(svc, NULL, 0), svc->cmd, svc->env);
 		svc_missing(svc);
 		return 1;
 	}
@@ -481,8 +500,9 @@ static int service_start(svc_t *svc)
 		}
 	}

+	compose_cmdline(svc, cmdline, sizeof(cmdline));
 	if (svc_is_sysv(svc))
-		logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s start' ...", svc->cmd);
+		logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s start' ...", cmdline);

 	if (!svc->desc[0])
 		do_progress = 0;
@@ -518,7 +538,7 @@ static int service_start(svc_t *svc)
 			int rc;

 			if ((rc = wordexp(svc->cmd, &we, 0))) {
-				_e("%s: failed wordexp(%s): %d", svc->cmd, svc->cmd, rc);
+				_e("%s: failed wordexp(%s): %d", svc_ident(svc, NULL, 0), svc->cmd, rc);
 			nomem:
 				wordfree(&we);
 				_exit(1);
@@ -546,19 +566,19 @@ static int service_start(svc_t *svc)
 				strlcat(str, arg, sizeof(str));

 				if ((rc = wordexp(str, &we, WRDE_APPEND))) {
-					_e("%s: failed wordexp(%s): %d", svc->cmd, str, rc);
+					_e("%s: failed wordexp(%s): %d", svc_ident(svc, NULL, 0), str, rc);
 					goto nomem;
 				}
 			}

 			if (we.we_wordc > MAX_NUM_SVC_ARGS) {
-				logit(LOG_ERR, "%s: too man args after expansion.", svc->cmd);
+				logit(LOG_ERR, "%s: too many args to %s after expansion.", svc_ident(svc, NULL, 0), svc->cmd);
 				goto nomem;
 			}

 			for (i = 0; i < we.we_wordc; i++) {
 				if (strlen(we.we_wordv[i]) >= sizeof(svc->args[i])) {
-					logit(LOG_ERR, "%s: expanded arg. '%s' too long", we.we_wordv[i]);
+					logit(LOG_ERR, "%s: expanded %s arg. '%s' too long", svc_ident(svc, NULL, 0), svc->cmd, we.we_wordv[i]);
 					rc = WRDE_NOSPACE;
 					goto nomem;
 				}
@@ -569,9 +589,16 @@ static int service_start(svc_t *svc)
 			}
 			wordfree(&we);
 		} else {
+			size_t j;
+
 			i = 0;
 			args[i++] = svc->cmd;
-			args[i++] = svc->cmd;
+			/* this handles, e.g., bridge-stop br0 start */
+			for (j = 0; j < MAX_NUM_SVC_ARGS; j++) {
+				if (!strlen(svc->args[j]))
+					break;
+				args[i++] = svc->args[j];
+			}
 			args[i++] = "start";
 		}
 		args[i] = NULL;
@@ -604,16 +631,7 @@ static int service_start(svc_t *svc)

 		_exit(status);
 	} else if (debug) {
-		char buf[CMD_SIZE] = "";
-
-		for (i = 0; i < MAX_NUM_SVC_ARGS; i++) {
-			if (strlen(svc->args[i]) == 0)
-				break;
-			if (buf[0])
-				strlcat(buf, " ", sizeof(buf));
-			strlcat(buf, svc->args[i], sizeof(buf));
-		}
-		_d("Starting %s %s", svc->cmd, buf);
+		_d("Starting %s", cmdline);
 	}

 	if (svc_is_tty(svc))
@@ -621,7 +639,8 @@ static int service_start(svc_t *svc)
 	else
 		cgroup_service(group_name(svc, grnam, sizeof(grnam)), pid, &svc->cgroup);

-	logit(LOG_CONSOLE | LOG_NOTICE, "Starting %s[%d]", svc_ident(svc, NULL, 0), pid);
+	if (!svc_is_sysv(svc))
+		logit(LOG_CONSOLE | LOG_NOTICE, "Starting %s[%d]", svc_ident(svc, NULL, 0), pid);

 	svc->pid = pid;
 	svc->start_time = jiffies();
@@ -668,7 +687,7 @@ static void service_kill(svc_t *svc)

 	if (svc->pid <= 1) {
 		/* Avoid killing ourselves or all processes ... */
-		_d("%s: Aborting SIGKILL, already terminated.", svc->cmd);
+		_d("%s: Aborting SIGKILL, already terminated.", svc_ident(svc, NULL, 0));
 		return;
 	}

@@ -698,7 +717,7 @@ static void service_cleanup(svc_t *svc)
 	fn = pid_file(svc);
 	if (fn && remove(fn) && errno != ENOENT)
 		logit(LOG_CRIT, "Failed removing service %s pidfile %s",
-		      basename(svc->cmd), fn);
+		      svc_ident(svc, NULL, 0), fn);

 	/* No longer running, update books. */
 	if (svc_is_tty(svc) && svc->pid > 1)
@@ -717,6 +736,7 @@ static void service_cleanup(svc_t *svc)
 */
 static int service_stop(svc_t *svc)
 {
+	char cmdline[CMD_SIZE] = "";
 	int do_progress = 1;
 	int rc = 0;

@@ -728,6 +748,7 @@ static int service_stop(svc_t *svc)

 	service_timeout_cancel(svc);

+	compose_cmdline(svc, cmdline, sizeof(cmdline));
 	if (!svc_is_sysv(svc)) {
 		if (svc->pid <= 1)
 			return 1;
@@ -737,7 +758,7 @@ static int service_stop(svc_t *svc)
 		logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending %s ...",
 		      svc_ident(svc, NULL, 0), svc->pid, sig_name(svc->sighalt));
 	} else {
-		logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s stop' ...", svc->cmd);
+		logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s stop' ...", cmdline);
 	}

 	/*
@@ -747,6 +768,14 @@ static int service_stop(svc_t *svc)
 	 */
 	svc_started(svc);

+	/*
+	 * Verify there's still something there before we send the reaper.
+	 */
+	if (svc->pid > 1 && !pid_alive(svc->pid)) {
+		svc->pid = 0;
+		return 0;
+	}
+
 	if (!svc->desc[0])
 		do_progress = 0;

@@ -769,19 +798,30 @@ static int service_stop(svc_t *svc)
 			svc_set_state(svc, SVC_HALTED_STATE);
 		}
 	} else {
-		char *args[] = { svc->cmd, "stop", NULL };
+		char *args[MAX_NUM_SVC_ARGS + 1];
+		size_t i = 0, j;
 		pid_t pid;

+		args[i++] = svc->cmd;
+		/* this handles, e.g., bridge-stop br0 stop */
+		for (j = 0; j < MAX_NUM_SVC_ARGS; j++) {
+			if (!strlen(svc->args[j]))
+				break;
+			args[i++] = svc->args[j];
+		}
+		args[i++] = "stop";
+		args[i] = NULL;
+
 		pid = fork();
 		switch (pid) {
 		case 0:
 			setsid();
 			redirect(svc);
-			exec_runtask(svc->cmd, args);
+			exec_runtask(args[0], &args[1]);
 			_exit(0);
 			break;
 		case -1:
-			_pe("Failed fork() to call sysv script '%s stop'", svc->cmd);
+			_pe("Failed fork() to call sysv script '%s stop'", cmdline);
 			rc = 1;
 			break;
 		default:
@@ -820,7 +860,7 @@ static int service_restart(svc_t *svc)
 		return 1;

 	if (svc->pid <= 1) {
-		_d("Bad PID %d for %s, SIGHUP", svc->pid, svc->cmd);
+		_d("%s: bad PID %d for %s, SIGHUP", svc_ident(svc, NULL, 0), svc->pid, svc->cmd);
 		svc->start_time = svc->pid = 0;
 		return 1;
 	}
@@ -923,7 +963,7 @@ static void parse_env(svc_t *svc, char *env)
 		return;

 	if (strlen(env) >= sizeof(svc->env)) {
-		_e("%s: env file is too long (>%d chars)", svc->cmd, sizeof(svc->env));
+		_e("%s: env file is too long (>%zu chars)", svc_ident(svc, NULL, 0), sizeof(svc->env));
 		return;
 	}

@@ -947,7 +987,7 @@ static void parse_cgroup(svc_t *svc, char *cgroup)
 	}

 	if (strlen(ptr) >= sizeof(svc->cgroup)) {
-		_e("%s: cgroup settings too long (>%d chars)", svc->cmd, sizeof(svc->cgroup));
+		_e("%s: cgroup settings too long (>%zu chars)", svc_ident(svc, NULL, 0), sizeof(svc->cgroup));
 		return;
 	}

@@ -972,7 +1012,7 @@ static void parse_killdelay(svc_t *svc, char *delay)

 	sec = strtonum(delay, 1, 60, &errstr);
 	if (errstr) {
-		_e("%s: killdelay %s is %s (1-60)", svc->cmd, delay, errstr);
+		_e("%s: killdelay %s is %s (1-60)", svc_ident(svc, NULL, 0), delay, errstr);
 		return;
 	}

@@ -983,26 +1023,39 @@ static void parse_killdelay(svc_t *svc, char *delay)
 static void parse_script(char *type, char *script, char *buf, size_t len)
 {
 	if (access(script, X_OK))
-		logit(LOG_WARNING, "%s: %s:%s is missing or not executable, skipping.", type, script);
+		logit(LOG_WARNING, "%s:%s is missing or not executable, skipping.", type, script);
 	else
 		strlcpy(buf, script, len);
 }

 /*
- * name:<name>
+ * 'name:<name>' or derived from '/path/to/cmd args'
 */
-static void parse_name(svc_t *svc, char *arg)
+static char *parse_name(char *cmd, char *arg)
 {
 	char *name = NULL;

 	if (arg && !strncasecmp(arg, "name:", 5)) {
 		name = arg + 5;
 	} else {
-		name = strrchr(svc->cmd, '/');
-		name = name ? name + 1 : svc->cmd;
+		char *ptr;
+
+		ptr = strchr(cmd, ' ');
+		if (!ptr)
+			ptr = cmd + strlen(cmd);
+
+		while (ptr > cmd) {
+			if (*ptr == '/') {
+				ptr++;
+				break;
+			}
+			ptr--;
+		}
+
+		name = ptr;
 	}

-	strlcpy(svc->name, name, sizeof(svc->name));
+	return name;
 }

 /*
@@ -1154,7 +1207,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	char *dev = NULL;
 	int respawn = 0;
 	int levels = 0;
-	int manual = 0;
+	int forking = 0, manual = 0;
 	int restart_max = SVC_RESPAWN_MAX;
 	int restart_tmo = 0;
 	unsigned oncrash_action = SVC_ONCRASH_IGNORE;
@@ -1213,6 +1266,8 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			pid = cmd;
 		else if (!strncasecmp(cmd, "name:", 5))
 			name = cmd;
+		else if (!strncasecmp(cmd, "type:forking", 10))
+			forking = 1;
 		else if (!strncasecmp(cmd, "manual:yes", 10))
 			manual = 1;
 		else if (!strncasecmp(cmd, "restart:", 8))
@@ -1258,6 +1313,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		return 0;
 	}

+	name = parse_name(cmd, name);
 	if (!id)
 		id = "";

@@ -1299,11 +1355,11 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	next:
 		svc = svc_find_by_tty(dev);
 	} else
-		svc = svc_find(cmd, id);
+		svc = svc_find(name, id);

 	if (!svc) {
-		_d("Creating new svc for %s id #%s type %d", cmd, id, type);
-		svc = svc_new(cmd, id, type);
+		_d("Creating new svc for %s name %s id %s type %d", cmd, name, id, type);
+		svc = svc_new(cmd, name, id, type);
 		if (!svc) {
 			_e("Out of memory, cannot register service %s", cmd);
 			return errno = ENOMEM;
@@ -1316,6 +1372,8 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		svc->restart_tmo = restart_tmo;
 		svc->oncrash_action = oncrash_action;
 	} else {
+		_d("Found existing svc for %s name %s id %s type %d", cmd, name, id, type);
+
 		/* update type, may have changed from service -> task */
 		svc->type = type;

@@ -1324,10 +1382,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			svc_unblock(svc);
 	}

-	/* Decode any optional pid:/optional/path/to/file.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) {
 		char *ptr = strchr(username, ':');

@@ -1342,7 +1396,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	}

 	svc->runlevels = levels;
-	_d("Service %s runlevel 0x%02x", svc->cmd, svc->runlevels);
+	_d("Service %s runlevel 0x%02x", svc_ident(svc, NULL, 0), svc->runlevels);

 	conf_parse_cond(svc, cond);

@@ -1376,8 +1430,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			id = ptr;
 		strlcpy(svc->name, "tty", sizeof(svc->name));
 		strlcpy(svc->id, id, sizeof(svc->id));
-	} else
-		parse_name(svc, name);
+	}

 	parse_cmdline_args(svc, cmd);

@@ -1405,8 +1458,26 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		parse_env(svc, env);
 	if (file)
 		strlcpy(svc->file, file, sizeof(svc->file));
-	if (respawn)
-		svc->respawn = 1;
+	svc->respawn = respawn;
+	svc->forking = forking;
+
+	/* Decode any (optional) pid:/optional/path/to/file.pid */
+	if (svc_is_daemon(svc) || svc_is_sysv(svc)) {
+		char tmp[sizeof(svc->name) + 6]; /* pid:! + svc->name */
+
+		/* no pid: set, figure out a default to track this svc */
+		if (!pid && forking) {
+			snprintf(tmp, sizeof(tmp), "pid:!%s", svc->name);
+			pid = tmp;
+			logit(LOG_INFO, "%s: forking but no pid:!file set, guessing -> %s", svc->name, tmp);
+		}
+
+		if (pid && pid_file_parse(svc, pid))
+			logit(LOG_WARNING, "%s: service has invalid 'pid:' config: %s", svc->name, pid);
+
+		if (svc->pidfile[0] == '!')
+			svc->forking = 1;
+	}

 	/* Set configured limits */
 	memcpy(svc->rlimit, rlimit, sizeof(svc->rlimit));
@@ -1479,14 +1550,22 @@ void service_monitor(pid_t lost, int status)

 	default:
 		_d("collected %s(%d), normal exit: %d, signaled: %d, exit code: %d",
-		   svc->cmd, lost, WIFEXITED(status), WIFSIGNALED(status), WEXITSTATUS(status));
+		   svc_ident(svc, NULL, 0), lost, WIFEXITED(status), WIFSIGNALED(status), WEXITSTATUS(status));
 		svc->status = status;
 		break;
 	}

 	/* Forking sysv/services declare themselves with pid:!/path/to/pid.file  */
-	if (svc_is_starting(svc) && svc_is_forking(svc))
-		return;
+	if (svc_is_forking(svc)) {
+		/* Likely start script exiting */
+		if (svc_is_starting(svc)) {
+			svc->pid = 0;	/* Expect no more activity from this one */
+			goto cont;
+		}
+
+		logit(LOG_CONSOLE | LOG_NOTICE, "Stopped %s[%d]", svc_ident(svc, NULL, 0), lost);
+	}
+

 	/* Terminate any children in the same proess group, e.g. logit */
 	kill(-svc->pid, SIGKILL);
@@ -1505,11 +1584,11 @@ void service_monitor(pid_t lost, int status)
 done:
 	/* No longer running, update books. */
 	svc->start_time = svc->pid = 0;
-
+cont:
 	if (!service_step(svc)) {
 		/* Clean out any bootstrap tasks, they've had their time in the sun. */
 		if (svc_clean_bootstrap(svc))
-			_d("collected bootstrap task %s(%d), removing.", svc->cmd, lost);
+			_d("collected bootstrap task %s(%d), removing.", svc_ident(svc, NULL, 0), lost);
 	}

 	sm_step(&sm);
@@ -1561,21 +1640,11 @@ static void service_kill_script(svc_t *svc)
 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));
@@ -1592,12 +1661,20 @@ static void service_pre_script(svc_t *svc)
 	}

 	if (svc->pid == 0) {
+		char buf[CMD_SIZE];
 		char *argv[4] = {
 			"sh",
-			"-c",
-			svc->pre_script,
+			"-ac",
+			buf,
 			NULL
 		};
+		char *env_file;
+
+		env_file = svc_getenv(svc);
+		if (env_file)
+			snprintf(buf, sizeof(buf), ". %s; exec %s", env_file, svc->pre_script);
+		else
+			strlcpy(buf, svc->pre_script, sizeof(buf));

 		set_pre_post_envs(svc, "pre");
 		execvp(_PATH_BSHELL, argv);
@@ -1617,17 +1694,24 @@ static void service_post_script(svc_t *svc)
 	}

 	if (svc->pid == 0) {
+		char buf[CMD_SIZE];
 		char *argv[4] = {
 			"sh",
-			"-c",
-			svc->post_script,
+			"-ac",
+			buf,
 			NULL
 		};
+		char *env_file;
 		int rc, sig;

 		rc = WEXITSTATUS(svc->status);
 		sig = WTERMSIG(svc->status);

+		env_file = svc_getenv(svc);
+		if (env_file)
+			snprintf(buf, sizeof(buf), ". %s; exec %s", env_file, svc->post_script);
+		else
+			strlcpy(buf, svc->post_script, sizeof(buf));
 		set_pre_post_envs(svc, "post");

 		if (WIFEXITED(svc->status)) {
@@ -1656,7 +1740,7 @@ static void service_retry(svc_t *svc)

 	service_timeout_cancel(svc);
 	if (svc->respawn) {
-		_d("%s crashed/exited, respawning ...", svc->cmd);
+		_d("%s crashed/exited, respawning ...", svc_ident(svc, NULL, 0));
 		svc_unblock(svc);
 		service_step(svc);
 		return;
@@ -1664,6 +1748,7 @@ static void service_retry(svc_t *svc)

 	if (svc->state != SVC_HALTED_STATE ||
 	    svc->block != SVC_BLOCK_RESTARTING) {
+		svc_set_state(svc, SVC_RUNNING_STATE);
 		logit(LOG_CONSOLE | LOG_NOTICE, "Successfully restarted crashing service %s.",
 		      svc_ident(svc, NULL, 0));
 		return;
@@ -1676,7 +1761,7 @@ static void service_retry(svc_t *svc)
 		svc_crashing(svc);
 		*restart_cnt = 0;
 		if (svc->oncrash_action == SVC_ONCRASH_REBOOT) {
-			logit(LOG_ERR, "%s issuing reboot", svc->cmd);
+			logit(LOG_ERR, "%s issuing reboot", svc_ident(svc, NULL, 0));
 			sync();
 			kill(1, SIGTERM);
 		}
@@ -1686,7 +1771,7 @@ static void service_retry(svc_t *svc)

 	(*restart_cnt)++;

-	_d("%s crashed, trying to start it again, attempt %d", svc->cmd, *restart_cnt);
+	_d("%s crashed, trying to start it again, attempt %d", svc_ident(svc, NULL, 0), *restart_cnt);
 	logit(LOG_CONSOLE | LOG_WARNING, "Service %s[%d] died, restarting (%d/%d)",
 	      svc_ident(svc, NULL, 0), svc->oldpid, *restart_cnt, svc->restart_max);
 	svc_unblock(svc);
@@ -1708,7 +1793,7 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
 	/* if PID isn't collected within SVC_TERM_TIMEOUT msec, kill it! */
 	if (*state == SVC_STOPPING_STATE) {
 		_d("%s is stopping, wait %d sec before sending SIGKILL ...",
-		   svc->cmd, svc->killdelay / 1000);
+		   svc_ident(svc, NULL, 0), svc->killdelay / 1000);
 		service_timeout_cancel(svc);
 		service_timeout_after(svc, svc->killdelay, service_kill);
 	}
@@ -1716,8 +1801,8 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
 	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);
+		snprintf(success, sizeof(success), "%s/%s/success", svc_typestr(svc), svc_ident(svc, NULL, 0));
+		snprintf(failure, sizeof(failure), "%s/%s/failure", svc_typestr(svc), svc_ident(svc, NULL, 0));

 		/* create success/failure condition when entering SVC_DONE_STATE. */
 		if (*state == SVC_DONE_STATE) {
@@ -1733,6 +1818,39 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
 			cond_clear(failure);
 		}
 	}
+
+	if (svc_is_daemon(svc)) {
+		char cond[MAX_COND_LEN];
+
+		snprintf(cond, sizeof(cond), "service/%s/", svc_ident(svc, NULL, 0));
+		cond_clear(cond);
+
+		switch (svc->state) {
+		case SVC_HALTED_STATE:
+		case SVC_RUNNING_STATE:
+			strlcat(cond, svc_status(svc), sizeof(cond));
+			cond_set_oneshot(cond);
+			break;
+
+		default:
+			break;
+		}
+	}
+}
+
+/*
+ * Called by pidfile plugin for forking services that have successfully started.
+ * We get here when the service_monitor() collects the PID, sets svc->pid to 0,
+ * and the state machine prepares for the worst bu setting state to HALTED.
+ */
+void service_forked(svc_t *svc)
+{
+	/* Stop forking_retry() timer */
+	service_timeout_cancel(svc);
+
+	/* Not crashing, restore RUNNING state */
+	svc_unblock(svc);
+	svc_set_state(svc, SVC_RUNNING_STATE);
 }

 /*
@@ -1753,7 +1871,7 @@ restart:
 	old_state = svc->state;
 	enabled = svc_enabled(svc);

-	_d("%20s(%4d): %8s %3sabled/%-7s cond:%-4s", svc->cmd, svc->pid,
+	_d("%20s(%4d): %8s %3sabled/%-7s cond:%-4s", svc_ident(svc, NULL, 0), svc->pid,
 	   svc_status(svc), enabled ? "en" : "dis", svc_dirtystr(svc),
 	   condstr(cond_get_agg(svc->cond)));

@@ -1777,7 +1895,7 @@ restart:
 		if (!svc->pid) {
 			char condstr[MAX_COND_LEN];

-			_d("%s: stopped, cleaning up timers and conditions ...", svc->cmd);
+			_d("%s: stopped, cleaning up timers and conditions ...", svc_ident(svc, NULL, 0));
 			service_timeout_cancel(svc);
 			cond_clear(mkcond(svc, condstr, sizeof(condstr)));

@@ -1845,27 +1963,26 @@ restart:
 		}

 		if (!svc->pid) {
-			if (svc_is_daemon(svc) || svc_is_tty(svc)) {
+			if (svc_is_daemon(svc) || svc_is_sysv(svc) || svc_is_tty(svc)) {
 				svc_restarting(svc);
 				svc_set_state(svc, SVC_HALTED_STATE);

 				/*
-				 * Restart directly after the first crash,
-				 * then retry after 2 sec
+				 * Restart directly after the first crash, except for forking services
+				 * which we need to wait for the forked-off child to create its pid
+				 * file.  In both cases, after that, retry after 2 sec
 				 */
 				if (!svc->respawn)
-					_d("delayed restart of %s", svc->cmd);
-				service_timeout_after(svc, 1, service_retry);
+					_d("delayed restart of %s", svc_ident(svc, NULL, 0));
+				if (svc_is_forking(svc))
+					service_timeout_after(svc, 2000, service_retry);
+				else
+					service_timeout_after(svc, 1, service_retry);
 				break;
 			}

-			if (svc_is_runtask(svc)) {
-				if (svc_is_sysv(svc)) {
-					if (!svc->started)
-						svc_set_state(svc, SVC_STOPPING_STATE);
-				} else {
-					svc_set_state(svc, SVC_STOPPING_STATE);
-				}
+			if (svc_is_runtask(svc)) { /* only run/task, not sysv here */
+				svc_set_state(svc, SVC_STOPPING_STATE);
 				svc->once++;
 				break;
 			}
@@ -1944,7 +2061,7 @@ restart:
 	}

 	if (svc->state != old_state) {
-		_d("%20s(%4d): -> %8s", svc->cmd, svc->pid, svc_status(svc));
+		_d("%20s(%4d): -> %8s", svc_ident(svc, NULL, 0), svc->pid, svc_status(svc));
 		changed++;
 		goto restart;
 	}
@@ -2015,15 +2132,15 @@ int service_completed(void)

 		if (strstr(svc->cond, plugin_hook_str(HOOK_SVC_UP)) ||
 		    strstr(svc->cond, plugin_hook_str(HOOK_SYSTEM_UP))) {
-			_d("Skipping %s(%s), post-strap hook", svc->desc, svc->cmd);
+			_d("Skipping %s(%s), post-strap hook", svc->desc, svc_ident(svc, NULL, 0));
 			continue;
 		}

 		if (!svc->once) {
-			_d("%s has not yet completed ...", svc->cmd);
+			_d("%s has not yet completed ...", svc_ident(svc, NULL, 0));
 			return 0;
 		}
-		_d("%s has completed ...", svc->cmd);
+		_d("%s has completed ...", svc_ident(svc, NULL, 0));
 	}

 	return 1;
@@ -1,7 +1,7 @@
 /* Finit service monitor, task starter and generic API for managing svc_t
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +35,11 @@ void      service_runtask_clean  (void);
 void      service_reload_dynamic (void);
 void      service_update_rdeps   (void);

+int       service_timeout_after  (svc_t *svc, int timeout, void (*cb)(svc_t *svc));
+int       service_timeout_cancel (svc_t *svc);
+
+void      service_forked         (svc_t *svc);
+
 int       service_step           (svc_t *svc);
 void      service_step_all       (int types);
 void      service_worker         (void *unused);
@@ -1,7 +1,7 @@
 /* Signal management - Be conservative with what finit responds to!
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -69,7 +69,12 @@
 *      Finit  defaults to nothing but sets sys/pwr/fail condition.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <dirent.h>
+#ifdef HAVE_MNTENT_H
+#include <mntent.h>
+#endif
 #include <string.h>		/* strerror() */
 #include <sched.h>
 #include <sys/reboot.h>
@@ -166,6 +171,30 @@ void mdadm_wait(void);
 void unmount_tmpfs(void);
 void unmount_regular(void);

+static void fs_swapoff(void)
+{
+	struct mntent *mnt;
+	char cmd[256];
+	FILE *fp;
+
+	if (!whichp("swapoff"))
+		return;
+
+	fp = setmntent(fstab, "r");
+	if (!fp)
+		return;
+
+	while ((mnt = getmntent(fp))) {
+		if (strcmp(mnt->mnt_type, MNTTYPE_SWAP))
+			continue;
+
+		snprintf(cmd, sizeof(cmd), "swapoff %s", mnt->mnt_fsname);
+		run_interactive(cmd, "Disabling swap %s", mnt->mnt_fsname);
+	}
+
+	endmntent(fp);
+}
+
 /*
 * Kernel threads have no cmdline so fgets() returns NULL for them.  We
 * also skip "special" processes, e.g. mdadm/mdmon or watchdogd that must
@@ -207,7 +236,8 @@ void do_iterate_proc(int (*cb)(int, void *), void *data)
 					_d("Skipping %s ...", &file[1]);
 				else
 					if (cb(pid, data)) {
-						print(0, "PID %d is still alive (%s)", pid, file);
+						_d("PID %d is still alive (%s)", pid, file);
+						fclose(fp);
 						break;
 					}
 			}
@@ -322,14 +352,21 @@ void do_shutdown(shutop_t op)

 	/* Unmount any tmpfs before unmounting swap ... */
 	unmount_tmpfs();
-	if (whichp("swapoff"))
-		run("swapoff -e -a", "swapoff");
+	fs_swapoff();

 	/* ... unmount remaining regular file systems. */
 	unmount_regular();

-	/* We sit on / so we must remount it read-only */
-	run("mount -n -o remount,ro -t none rootfs /", "mount");
+	/*
+	 * We sit on / so we must remount it ro, try all the things!
+	 * See the following links for details:
+	 *  - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=339023
+	 *  - https://bugs.launchpad.net/ubuntu/+source/util-linux/+bug/29187
+	 */
+	sync();
+	run("mount -n -o remount,ro -t dummytype dummydev /", NULL);
+	run("mount -n -o remount,ro dummydev /", NULL);
+	run("mount -n -o remount,ro /", "mount");

 	/* Call mdadm to mark any RAID array(s) as clean before halting. */
 	mdadm_wait();
@@ -459,8 +496,8 @@ static void sigterm_cb(uev_t *w, void *arg, int events)
 */
 static void sigchld_cb(uev_t *w, void *arg, int events)
 {
-	pid_t pid;
 	int status;
+	pid_t pid;

 	if (UEV_ERROR == events) {
 		_e("Unrecoverable error in signal watcher");
@@ -523,8 +560,8 @@ static void chld_handler(int sig, siginfo_t *info, void *ctx)

 void sig_init(void)
 {
-	int i;
 	struct sigaction sa;
+	int i;

 	for (i = 1; i < NSIG; i++)
 		IGNSIG(sa, i, SA_RESTART);
@@ -537,9 +574,9 @@ void sig_init(void)
 */
 void sig_unblock(void)
 {
-	int i;
-	sigset_t nmask;
 	struct sigaction sa;
+	sigset_t nmask;
+	int i;

 	sigemptyset(&nmask);
 	sigaddset(&nmask, SIGHUP);
@@ -1,7 +1,7 @@
 /* Signal management - Be conservative with what finit responds to!
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -187,7 +187,7 @@ restart:
 		 */
 		svc = svc_stop_completed();
 		if (svc) {
-			_d("Waiting to collect %s(%d) ...", svc->cmd, svc->pid);
+			_d("Waiting to collect %s, cmd %s(%d) ...", svc_ident(svc, NULL, 0), svc->cmd, svc->pid);
 			break;
 		}

@@ -240,7 +240,7 @@ restart:
 		 */
 		svc = svc_stop_completed();
 		if (svc) {
-			_d("Waiting to collect %s(%d) ...", svc->cmd, svc->pid);
+			_d("Waiting to collect %s, cmd %s(%d) ...", svc_ident(svc, NULL, 0), svc->cmd, svc->pid);
 			break;
 		}

@@ -1,6 +1,6 @@
 /* Reset terminal line settings (stty sane)
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,10 +21,12 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <errno.h>
 #include <stdlib.h>
-#include <unistd.h>	      /* _POSIX_VDISABLE */
-#include <sys/ttydefaults.h>  /* Not included by default in musl libc */
+#include <unistd.h>		/* _POSIX_VDISABLE */
+#include <sys/ttydefaults.h>	/* Not included by default in musl libc */
 #include <termios.h>

 #include "helpers.h"
@@ -1,6 +1,6 @@
 /* poor man's sulogin, may be statically linked
 *
- * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2021-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -193,6 +193,9 @@ int main(void)
 		nopass:
 			freepw(&pw);

+			/* tell initctl/reboot to trigger force mode */
+			setenv("SULOGIN", "finit", 1);
+
 			return sh();
 		}
 	}
@@ -1,7 +1,7 @@
 /* Low-level service primitives and generic API for managing svc_t structures
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,8 @@
 * THE SOFTWARE.
 */

-#include <err.h>
+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>		/* isdigit() */
 #include <time.h>
 #include <signal.h>
@@ -105,16 +106,17 @@ static void svc_gc(void *arg)
 /**
 * svc_new - Create a new service
 * @cmd:  External program to call
+ * @name: Default or custom svc name
 * @id:   Instance id
 * @type: Service type, one of service, task, run
 *
 * Returns:
 * A pointer to a new &svc_t object, or %NULL if out of empty slots.
 */
-svc_t *svc_new(char *cmd, char *id, int type)
+svc_t *svc_new(char *cmd, char *name, char *id, int type)
 {
-	int job = -1;
 	svc_t *svc, *iter = NULL;
+	int job = -1;

 	/* Find first job n:o if registering multiple instances */
 	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
@@ -132,6 +134,8 @@ svc_t *svc_new(char *cmd, char *id, int type)

 	svc->type = type;
 	svc->job  = job;
+	if (name)
+		strlcpy(svc->name, name, sizeof(svc->name));
 	if (id && id[0])
 		strlcpy(svc->id, id, sizeof(svc->id));
 	if (cmd)
@@ -346,13 +350,13 @@ svc_t *svc_stop_completed(void)

 /**
 * svc_find - Find a service object by its full path name
- * @cmd: Full path name, e.g., /sbin/syslogd
- * @id:  Optional instance id
+ * @name: Full path name, e.g., /sbin/syslogd
+ * @id:   Optional instance id
 *
 * Returns:
 * A pointer to an &svc_t object, or %NULL if not found.
 */
-svc_t *svc_find(char *cmd, char *id)
+svc_t *svc_find(char *name, char *id)
 {
 	svc_t *svc, *iter = NULL;

@@ -360,7 +364,7 @@ svc_t *svc_find(char *cmd, char *id)
 		id = "";

 	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
-		if (!strcmp(svc->cmd, cmd) && !strcmp(svc->id, id))
+		if (!strcmp(svc->name, name) && !strcmp(svc->id, id))
 			return svc;
 	}

@@ -409,30 +413,6 @@ svc_t *svc_find_by_jobid(int job, char *id)
 	return NULL;
 }

-/**
- * svc_find_by_nameid - Find an service object by its basename:ID
- * @name: Process name to match
- * @id:   Optional instance id
- *
- * Returns:
- * A pointer to an &svc_t object, or %NULL if not found.
- */
-svc_t *svc_find_by_nameid(char *name, char *id)
-{
-	svc_t *svc, *iter = NULL;
-
-	if (!id)
-		id = "";
-
-	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
-		if (!strcmp(svc->id, id) && !strcmp(name, svc->name))
-			return svc;
-	}
-
-	return NULL;
-}
-
-
 svc_t *svc_find_by_tty(char *dev)
 {
 	svc_t *svc, *iter = NULL;
@@ -718,7 +698,7 @@ int svc_parse_jobstr(char *str, size_t len, void *user_data, int (*found)(svc_t
 				*ptr++ = 0;
 				id  = ptr;

-				svc = svc_find_by_nameid(token, id);
+				svc = svc_find(token, id);
 				if (!svc && not_found)
 					result += not_found(token, id, user_data);
 				else if (found)
@@ -1,7 +1,7 @@
 /* Low-level service primitives and generic API for managing svc_t structures
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2008-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -127,6 +127,7 @@ typedef struct svc {
 	int            starting;       /* ... waiting for pidfile to be re-asserted */
 	int	       runlevels;
 	int            sighup;	       /* This service supports SIGHUP :) */
+	int	       forking;	       /* This is a service/sysv daemon that forks, wait for it ... */
 	svc_block_t    block;	       /* Reason that this service is currently stopped */
 	char           cond[MAX_COND_LEN];

@@ -192,14 +193,13 @@ typedef struct svc {
 	struct timespec gc;
 } svc_t;

-svc_t      *svc_new                (char *cmd, char *id, int type);
+svc_t      *svc_new                (char *cmd, char *name, char *id, int type);
 int	    svc_del	           (svc_t *svc);
 void	    svc_validate	   (svc_t *svc);

-svc_t	   *svc_find	           (char *cmd, char *id);
+svc_t	   *svc_find	           (char *name, char *id);
 svc_t	   *svc_find_by_pid        (pid_t pid);
 svc_t	   *svc_find_by_jobid      (int job, char *id);
-svc_t	   *svc_find_by_nameid     (char *name, char *id);
 svc_t	   *svc_find_by_tty        (char *dev);
 svc_t      *svc_find_by_pidfile    (char *fn);

@@ -228,7 +228,7 @@ static inline int svc_is_daemon    (svc_t *svc) { return svc && SVC_TYPE_SERVICE
 static inline int svc_is_sysv      (svc_t *svc) { return svc && SVC_TYPE_SYSV    == svc->type; }
 static inline int svc_is_tty       (svc_t *svc) { return svc && SVC_TYPE_TTY     == svc->type; }
 static inline int svc_is_runtask   (svc_t *svc) { return svc && (SVC_TYPE_RUNTASK & svc->type);}
-static inline int svc_is_forking   (svc_t *svc) { return (svc_is_daemon(svc) || svc_is_sysv(svc)) && svc->pidfile[0] == '!'; }
+static inline int svc_is_forking   (svc_t *svc) { return svc && svc->forking; }

 static inline int svc_in_runlevel  (svc_t *svc, int runlevel) { return svc && ISSET(svc->runlevels, runlevel); }
 static inline int svc_nohup        (svc_t *svc) { return svc &&  (0 == svc->sighup || 0 != svc->args_dirty); }
@@ -1,7 +1,7 @@
 /* Finit TTY handling
 *
 * Copyright (c) 2013       Mattias Walström <lazzer@gmail.com>
- * Copyright (c) 2013-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2013-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -22,6 +22,8 @@
 * THE SOFTWARE.
 */

+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>		/* isdigit() */
 #include <signal.h>
 #include <termios.h>
@@ -170,7 +172,7 @@ int tty_parse_args(char *cmd, struct tty *tty)
 		else
 			tty->args[tty->num++] = cmd;

-		cmd = strtok(NULL, " \t");
+		cmd = strtok(NULL, " ");
 	} while (cmd && tty->num < NELEMS(tty->args));

 	/* rescue shells are always notty */
@@ -1,7 +1,7 @@
 /* Finit TTY handling
 *
 * Copyright (c) 2013       Mattias Walström <lazzer@gmail.com>
- * Copyright (c) 2013-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2013-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Misc. shared utility functions for initctl, reboot and finit
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,10 +21,13 @@
 * THE SOFTWARE.
 */

-#include "config.h"
+#include "config.h"		/* Generated by configure script */
+
 #include <ctype.h>		/* isprint() */
 #include <errno.h>
+#ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <regex.h>
 #include <string.h>
 #include <stdlib.h>
@@ -224,7 +227,7 @@ int fngetint(char *path, int *val)
 {
 	char buf[64];

-	if (fnread(buf, sizeof(buf), path) <= 0)
+	if (fnread(buf, sizeof(buf), "%s", path) <= 0)
 		return -1;

 	errno = 0;
@@ -235,6 +238,40 @@ int fngetint(char *path, int *val)
 	return 0;
 }

+/*
+ * This is a replacement for the non-working reboot(RB_SW_SUSPEND).  It
+ * checks for suspend to RAM support, assuming `mem_sleep` has a sane
+ * default, e.g. 'deep' or 's2idle'.  The latter should be possible to
+ * select from finit.conf, but for now we go with the kernel default.
+ * For more information on kernel sleep states, see:
+ * https://www.kernel.org/doc/html/latest/admin-guide/pm/sleep-states.html
+ */
+int suspend(void)
+{
+	char buf[80];
+	char *ptr;
+
+	if (fnread(buf, sizeof(buf), "/sys/power/state") <= 0) {
+	opnotsup:
+		errno = EINVAL;
+		return 1;
+	}
+
+	chomp(buf);
+
+	ptr = strtok(buf, " ");
+	while (ptr) {
+		if (!strcmp(ptr, "mem"))
+			break;
+
+		ptr = strtok(NULL, " ");
+	}
+	if (!ptr)
+		goto opnotsup;
+
+	return fnwrite("mem", "/sys/power/state");
+}
+
 int strtobytes(char *arg)
 {
 	int mod = 0, bytes;
@@ -454,7 +491,9 @@ static int hasopt(char *opts, char *opt)

 int ismnt(char *file, char *dir, char *mode)
 {
+	struct mntent mount;
 	struct mntent *mnt;
+	char buf[256];
 	int found = 0;
 	FILE *fp;

@@ -462,7 +501,7 @@ int ismnt(char *file, char *dir, char *mode)
 	if (!fp)
 		return 0;	/* Dunno, maybe not */

-	while ((mnt = getmntent(fp))) {
+	while ((mnt = getmntent_r(fp, &mount, buf, sizeof(buf)))) {
 		if (!strcmp(mnt->mnt_dir, dir)) {
 			if (mode) {
 				if (hasopt(mnt->mnt_opts, mode))
@@ -1,6 +1,6 @@
 /* Misc. shared utility functions for initctl, reboot and finit
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -54,11 +54,13 @@ extern char *prognm;

 char *progname     (char *arg0);

-char *str          (char *fmt, ...);
-int   fnread       (char *buf, size_t len, char *fmt, ...);
-int   fnwrite      (char *value, char *fmt, ...);
+char *str          (char *fmt, ...)                        __attribute__ ((format (printf, 1, 2)));
+int   fnread       (char *buf, size_t len, char *fmt, ...) __attribute__ ((format (printf, 3, 4)));
+int   fnwrite      (char *value, char *fmt, ...)           __attribute__ ((format (printf, 2, 3)));
 int   fngetint     (char *path, int *val);

+int   suspend      (void);
+
 int   strtobytes   (char *arg);
 char *sig2str      (int sig);
 int   str2sig      (char *sig);
@@ -85,7 +87,7 @@ int     ttcooked   (void);
 #define ttcooked() 0
 #endif

-static inline void dbg(char *fmt, ...)
+static __attribute__ ((format (printf, 1, 2))) inline void dbg(char *fmt, ...)
 {
 	va_list ap;

@@ -1,6 +1,6 @@
 /* UTMP API
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,7 @@
 * THE SOFTWARE.
 */

-#include "config.h"
+#include "config.h"		/* Generated by configure script */

 #include <time.h>
 #include <arpa/inet.h>
@@ -1,6 +1,6 @@
 /* UTMP API
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Built-in watchdog daemon
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,6 +1,6 @@
 /* Built-in watchdog daemon
 *
- * Copyright (c) 2016-2021  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2016-2022  Joachim Wiberg <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -1,8 +1,30 @@
 SUBDIRS                  = common tenv

-EXTRA_DIST		 = setup-root.sh
+EXTRA_DIST		 = skel/bin/busybox-x86_64.md5 skel/sbin/service.sh skel/bin/slay  \
+			   skel/etc/env skel/bin/pre.sh skel/bin/post.sh skel/sbin/task.sh \
+			   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/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	   \
+			   skel/usr/bin/.empty skel/usr/lib/.empty skel/usr/sbin/.empty	   \
+			   skel/home/.empty skel/usr/games/.empty skel/usr/src/.empty	   \
+			   skel/usr/share/.empty skel/usr/include/.empty		   \
+			   skel/usr/local/games/.empty skel/usr/local/sbin/.empty	   \
+			   skel/usr/local/share/.empty skel/usr/local/src/.empty	   \
+			   skel/usr/local/lib/.empty skel/usr/local/bin/.empty		   \
+			   skel/usr/local/etc/.empty skel/var/.empty
+
+EXTRA_DIST		+= setup-root.sh
 EXTRA_DIST		+= add-remove-dynamic-service.sh
 EXTRA_DIST		+= add-remove-dynamic-service-sub-config.sh
+EXTRA_DIST		+= cond-start-task.sh
+EXTRA_DIST		+= failing-sysv.sh
+EXTRA_DIST		+= global-envs.sh
+EXTRA_DIST		+= pre-post-serv.sh
+EXTRA_DIST		+= runlevel.sh
 EXTRA_DIST		+= start-stop-service.sh
 EXTRA_DIST		+= start-stop-service-sub-config.sh
 EXTRA_DIST		+= start-kill-service.sh
@@ -26,6 +48,11 @@ TESTS			 = checkself.sh
 TESTS			+= setup-root.sh
 TESTS			+= add-remove-dynamic-service.sh
 TESTS			+= add-remove-dynamic-service-sub-config.sh
+TESTS			+= cond-start-task.sh
+TESTS			+= failing-sysv.sh
+TESTS			+= global-envs.sh
+TESTS			+= pre-post-serv.sh
+TESTS			+= runlevel.sh
 TESTS			+= start-stop-service.sh
 TESTS			+= start-stop-service-sub-config.sh
 TESTS			+= start-kill-service.sh
@@ -13,15 +13,12 @@ test_teardown()
 	say "Running test teardown."

 	texec rm -f "$FINIT_RCSD/service.conf"
-	texec rm -f /test_assets/service.sh
 }

 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 -- Dyn serv' > $FINIT_RCSD/service.conf"
+texec sh -c "echo 'service [2345] kill:20 log service.sh -- Dyn serv' > $FINIT_RCSD/service.conf"

 say 'Reload Finit'
 texec sh -c "initctl reload"
@@ -3,7 +3,6 @@
 set -eu

 TEST_DIR=$(dirname "$0")
-export DEBUG=1

 # shellcheck source=/dev/null
 . "$TEST_DIR/tenv/lib.sh"
@@ -14,20 +13,12 @@ test_teardown()
 	say "Running test teardown."

 	texec rm -f "$FINIT_CONF"
-	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 -- Dyn service' > $FINIT_CONF"
+texec sh -c "echo 'service [2345] kill:20 log service.sh -- Dyn service' > $FINIT_CONF"

 say 'Reload Finit'
 texec sh -c "initctl reload"
@@ -1,4 +1,2 @@
-EXTRA_DIST	= service.conf service.sh S01-service.sh slay.sh
-
 noinst_PROGRAMS = serv
 serv_SOURCES    = serv.c
@@ -15,6 +15,38 @@

 #define PROGNM "serv"

+static void verify_env(char *arg)
+{
+	char *key, *value;
+	char *replica;
+	char *env;
+
+	key = replica = strdup(arg);
+	if (!replica)
+		err(1, "Failed duplicating arg %s", arg);
+
+	value = strchr(replica, ':');
+	if (!value)
+		errx(1, "Invalid format of KEY:VALUE arg, missing ':' in %s", replica);
+	*(value++) = 0;
+
+	env = getenv(key);
+	if (!env)
+		errx(1, "No '%s' in environment", key);
+
+	if (strcmp(env, value))
+		errx(1, "Mismatch, environment '%s' vs expected value '%s'", env, value);
+}
+
+static void verify_noenv(char *key)
+{
+	char *val;
+
+	val = getenv(key);
+	if (val)
+		errx(1, "Error, key %s is set in environment to '%s'", key, val);
+}
+
 static void sig(int signo)
 {
 	warnx("We got signal %d ...", signo);
@@ -48,8 +80,10 @@ static int usage(int rc)
 	fprintf(fp,
 		"%s [-nhp] [-P FILE]\n"
 		"\n"
-		" -n       Run in foreground\n"
 		" -h       Show help text (this)\n"
+		" -e K:V   Verify K environment variable is V value\n"
+		" -E K     Verify K is not set in the environment\n"
+		" -n       Run in foreground\n"
 		" -p       Create PID file despite running in foreground\n"
 		" -P FILE  Create PID file using FILE\n"
 		"\n"
@@ -69,10 +103,16 @@ int main(int argc, char *argv[])
 	char *pidfn = NULL;
 	int c;

-	while ((c = getopt(argc, argv, "hnpP:")) != EOF) {
+	while ((c = getopt(argc, argv, "e:E:hnpP:")) != EOF) {
 		switch (c) {
 		case 'h':
 			return usage(0);
+		case 'e':
+			verify_env(optarg);
+			break;
+		case 'E':
+			verify_noenv(optarg);
+			break;
 		case 'n':
 			do_background = 0;
 			do_pidfile--;
@@ -1 +0,0 @@
-service [2345] kill:20 log /test_assets/service.sh
@@ -0,0 +1,91 @@
+#!/bin/sh
+# A run/task runs once per runlevel, unless its .conf is touched
+# then it will run again on initctl reload.  This test verifies
+# this behavior, with the added twist of starting the task by
+# asserting a condition.
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+TEST_CONF=$FINIT_RCSD/cond.conf
+
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+	say "Running test teardown."
+	texec rm -f "$TEST_CONF"
+}
+
+test_one()
+{
+	cond=$1
+	stanza=$2
+
+	sleep 5
+	say 'Enable finit debug, try to figure out what is going on ...'
+	texec sh -c "initctl debug"
+
+	say "Add stanza '$stanza' to $TEST_CONF ..."
+	texec sh -c "echo '$stanza' > $TEST_CONF"
+
+	texec sh -c "ls -l /run/ /run/finit/"
+	say 'Reload Finit'
+	texec sh -c "initctl ls"
+	texec sh -c "initctl reload"
+	texec sh -c "initctl status"
+	texec sh -c "ps"
+
+	date
+	sleep 2
+	date
+	texec sh -c "ls -l /run/ /run/finit/"
+	say 'Asserting condition'
+	texec sh -c "initctl cond set $cond"
+
+	date
+	sleep 2
+	date
+	texec sh -c "ls -l /run/ /run/finit/"
+	texec sh -c "initctl status"
+	texec sh -c "ps"
+	texec sh -c "initctl status task.sh"
+
+	sleep 1
+	texec sh -c "echo Hej; cat /run/task.state"
+
+	assert_file_contains /run/task.state 1
+
+	say 'Reload Finit'
+	texec sh -c "initctl reload"
+	sleep 1
+	say 'Ensure task has not run again ...'
+	assert_file_contains /run/task.state 1
+
+	say 'Switch to another runlevel ...'
+	texec sh -c "initctl runlevel 3"
+	sleep 1
+	say 'Ensure task has run again ...'
+	assert_file_contains /run/task.state 2
+	
+	say 'Touch task.sh .conf file and reload Finit ...'
+	texec sh -c "touch $TEST_CONF"
+	texec sh -c "initctl reload"
+	sleep 1
+#	texec sh -c "initctl status task.sh"
+	assert_file_contains /run/task.state 3
+
+	say "Done, drop stanza from $TEST_CONF ..."
+	texec sh -c "rm $TEST_CONF"
+	texec sh -c "initctl reload"
+}
+
+test_one "hello" "task <usr/hello> task.sh -- Hello task"
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Verify what happesn when sysv scripts start services that keep
+# crashing -- hint: crashing sysv services should be detected by
+# Finit just like regular services.
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+	texec sh -c "mkdir -p /etc/default"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+	say "Running test teardown."
+
+	texec rm -f "$FINIT_CONF"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+# This instructs serv to check the environment, and exit
+# if it cannot find "xyzzy", thus triggering a premature
+# exit which Finit should act on to retstart it.
+say "Setting up bogus /etc/default/serv"
+texec sh -c "echo 'SERV_ARGS=\"-e xyzzy:lives\"' > /etc/default/serv"
+
+say "Add sysv stanza to $FINIT_CONF"
+texec sh -c "echo 'sysv restart:5 [2345] pid:!/run/serv.pid name:serv /etc/init.d/S02-serv.sh -- Crashing SysV service' > $FINIT_CONF"
+
+#texec sh -c "initctl debug"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+#texec sh -c "initctl status serv"
+#texec sh -c "ps"
+
+say 'Pending sysv restarts by Finit ...'
+#texec sh -c "initctl status serv"
+#texec sh -c "ps"
+retry 'assert_restarts 5 serv' 20 1
+
+return 0
@@ -0,0 +1,56 @@
+#!/bin/sh
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+
+	texec rm -f "$FINIT_CONF"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+#texec sh -c "initctl debug"
+say "Add custom envs to $FINIT_CONF ..."
+texec sh -c "echo 'foo=bar' >  $FINIT_CONF"
+texec sh -c "echo 'baz=qux' >> $FINIT_CONF"
+
+say "Add service stanza to $FINIT_CONF ..."
+texec sh -c "echo 'service serv -np -e foo:bar -- Verify foo=bar' >> $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Modify $FINIT_CONF slightly ..."
+texec sh -c "sed -i 's/foo:bar/baz:qux/; s/foo=bar/baz=qux/' $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Swap envs completely in $FINIT_CONF ..."
+texec sh -c "echo 'bar=foo' >  $FINIT_CONF"
+texec sh -c "echo 'qux=baz' >> $FINIT_CONF"
+
+say "Add swapped service stanza to $FINIT_CONF ..."
+texec sh -c "echo 'service serv -np -e bar:foo -E baz -- Verify bar=foo and no baz' >> $FINIT_CONF"
+
+say 'Reload Finit'
+texec sh -c "initctl reload"
+sleep 1
+retry 'assert_num_children 1 serv'
+
+say "Done, drop service from $FINIT_CONF ..."
+texec sh -c "rm $FINIT_CONF"
+texec sh -c "initctl reload"
@@ -0,0 +1,62 @@
+#!/bin/sh
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+
+	texec rm -f "$FINIT_CONF"
+}
+
+test_one()
+{
+	pre=$1
+	precont=$2
+	service=$3
+	post=$4
+	postcont=$5
+
+	say "Add service stanza '$service' to $FINIT_CONF ..."
+	texec sh -c "echo '$service' > $FINIT_CONF"
+
+	say 'Reload Finit'
+	texec sh -c "initctl reload"
+
+	retry 'assert_num_children 1 serv'
+	if [ -n "$pre" ]; then
+		assert_file_contains "$pre" "$precont"
+		texec sh -c "rm -f $pre"
+	fi
+
+	say 'Stop the service'
+	texec sh -c "initctl stop serv"
+
+	retry 'assert_num_children 0 serv'
+	if [ -n "$post" ]; then
+		assert_file_contains "$post" "$postcont"
+		texec sh -c "rm -f $post"
+	fi
+
+	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"
+
+#texec sh -c "initctl debug"
+
+test_one ""       ""  "service                   serv -np -- Regular fg service, no pre/post scripts" "" ""
+test_one ""       ""  "service env:/etc/env      serv -np -e foo:bar -- serv + env, no pre/post scripts" "" ""
+test_one /tmp/pre PRE "service pre:/bin/pre.sh   serv -np -- serv + pre script" "" ""
+test_one /tmp/pre bar "service env:/etc/env pre:/bin/pre.sh serv -np -e baz:qux -- Env + pre script" "" ""
+test_one ""       ""  "service post:/bin/post.sh serv -np -- Regular fg service, post script" /tmp/post POST
+test_one ""       ""  "service env:/etc/env post:/bin/post.sh serv -np -- Regular fg service, post script" /tmp/post qux
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Verify selecting alternate runlevel from cmdline
+set -eu
+
+TEST_DIR=$(dirname "$0")
+
+# shellcheck disable=SC2034
+FINIT_RUNLEVEL=9
+
+test_setup()
+{
+	say "Test start $(date)"
+}
+
+test_teardown()
+{
+	say "Test done $(date)"
+}
+
+# shellcheck source=/dev/null
+. "$TEST_DIR/tenv/lib.sh"
+
+say 'Check runlevel'
+lvl=$(texec sh -c "initctl runlevel | awk '{print \$2;}'")
+if [ "$lvl" -eq "9" ]; then
+	return 0
+fi
+
+return 1
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`service [2345] kill:20 log /test_assets/service.sh`