.github: allow release builds for -rcN

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

.github/workflows/build.yml

@@ -0,0 +1,70 @@
+name: Bob the Builder
+
+# Run on all branches, including all pull requests, except the 'dev'
+# branch since that's where we run Coverity Scan (limited tokens/day)
+on:
+  push:
+    branches:
+      - '**'
+      - '!dev'
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  build:
+    # Verify we can build on latest Ubuntu with both gcc and clang
+    name: ${{ matrix.compiler }}
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        compiler: [gcc, clang]
+      fail-fast: false
+    env:
+      MAKEFLAGS: -j3
+      CC: ${{ matrix.compiler }}
+    steps:
+      - name: Install dependencies
+        run: |
+          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
+          tar xf libuev-2.3.2.tar.xz
+          tar xf libite-2.3.1.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)
+          sudo ldconfig
+      - uses: actions/checkout@v2
+      - name: Static Finit
+        run: |
+          ./autogen.sh
+          ./configure --prefix= --enable-static
+          make V=1
+      - name: Regular Finit
+        run: |
+          ./configure --prefix= --enable-x11-common-plugin --with-watchdog --with-keventd
+          make clean
+          make V=1
+      - name: Install to ~/tmp and Inspect
+        run: |
+          DESTDIR=/tmp make install-strip
+          tree /tmp
+          ldd  /tmp/sbin/finit
+          size /tmp/sbin/finit
+          ldd  /tmp/sbin/initctl
+          size /tmp/sbin/initctl
+          ldd  /tmp/sbin/reboot
+          size /tmp/sbin/reboot
+          /tmp/sbin/finit -h
+          /tmp/sbin/initctl -h
+      - name: Run Unit Tests
+        run: |
+          ver=$(/tmp/sbin/initctl -V | awk '/Finit.*/ {print $2;}')
+          dir=finit-$ver/_build/sub
+          make -j1 distcheck || (cat $dir/test/setup-root.log; cat $dir/test/test-suite.log; false)
+      - name: Upload Test Results
+        uses: actions/upload-artifact@v2
+        with:
+          name: finit-test-${{ matrix.compiler }}
+          path: test/*

.github/workflows/coverity.yml

@@ -0,0 +1,63 @@
+name: Coverity Scan
+
+on:
+  push:
+    branches:
+      - 'dev'
+
+env:
+  PROJECT_NAME: finit
+  CONTACT_EMAIL: troglobit@gmail.com
+  COVERITY_NAME: troglobit-finit
+  COVERITY_PROJ: troglobit%2Ffinit
+
+jobs:
+  coverity:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        id: coverity-toolchain-cache
+        with:
+          path: cov-analysis-linux64
+          key: ${{ runner.os }}-coverity
+      - name: Download Coverity Scan
+        if: steps.coverity-toolchain-cache.outputs.cache-hit != 'true'
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        run: |
+          wget -q https://scan.coverity.com/download/cxx/linux64 \
+               --post-data "token=$TOKEN&project=${COVERITY_PROJ}" \
+               -O cov-analysis-linux64.tar.gz
+          mkdir cov-analysis-linux64
+          tar xzf cov-analysis-linux64.tar.gz --strip 1 -C cov-analysis-linux64
+      - name: Install dependencies
+        run: |
+          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
+          tar xf libuev-2.3.2.tar.xz
+          tar xf libite-2.3.1.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)
+          sudo ldconfig
+      - name: Build
+        run: |
+          ./autogen.sh
+          ./configure --prefix= --enable-x11-common-plugin --with-watchdog --with-keventd
+          export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
+          cov-build --dir cov-int make
+      - name: Submit result to Coverity Scan
+        env:
+          TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
+        run: |
+          tar czvf ${PROJECT_NAME}.tgz cov-int
+          curl \
+            --form project=${COVERITY_NAME} \
+            --form token=$TOKEN \
+            --form email=${CONTACT_EMAIL} \
+            --form file=@${PROJECT_NAME}.tgz \
+            --form version=trunk \
+            --form description="${PROJECT_NAME} $(git rev-parse HEAD)" \
+            https://scan.coverity.com/builds?project=${COVERITY_PROJ}

.github/workflows/release.yml

@@ -0,0 +1,69 @@
+name: Release General
+
+on:
+  push:
+    tags:
+      - '[0-9]+.[0-9]+*'
+
+jobs:
+  release:
+    name: Create GitHub release
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      release_id: ${{ steps.create_release.outputs.id }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Extract ChangeLog entry ...
+        # Hack to extract latest entry for body_path below
+        run: |
+          awk '/-----*/{if (x == 1) exit; x=1;next}x' ChangeLog.md \
+              |head -n -1 > release.md
+          cat release.md
+      - name: Create release ...
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Finit v${{ github.ref }}
+          body_path: release.md
+          draft: false
+          prerelease: false
+  tarball:
+    name: Build and upload release tarball
+    needs: release
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Installing dependencies
+        run: |
+          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
+          tar xf libuev-2.3.2.tar.xz
+          tar xf libite-2.3.1.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)
+          sudo ldconfig
+      - name: Creating Makefiles
+        run: |
+          ./autogen.sh
+          ./configure --prefix= --enable-x11-common-plugin --with-watchdog --with-keventd
+      - name: Building release
+        run: |
+          make release
+          ls -lF ../
+          mkdir -p artifacts/
+          mv ../*.tar.* artifacts/
+      - name: Uploading release artifacts
+        uses: skx/github-action-publish-binaries@release-0.15
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          releaseId: ${{ needs.release.outputs.release_id }}
+          args: artifacts/*

.gitignore

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

.travis.yml

@@ -1,62 +0,0 @@
-# Travis CI integration -- https://travis-ci.org/troglobit/finit
-# Defaults to GNU GCC and autotools: ./configure && make && make test
-language: c
-
-# Use docker for quicker builds, it now allows https://docs.travis-ci.com/user/apt/
-sudo: false
-
-# Test build with both GCC and Clang (LLVM)
-compiler:
-  - gcc
-  - clang
-
-# The secure: declaration is the encrypted COVERITY_SCAN_TOKEN, created
-#   via the "travis encrypt" command using the project repo's public key
-env:
-  global:
-   - PKG_CONFIG_PATH=/tmp/lib/pkgconfig
-   - CFLAGS="-W -Wall -Wextra"
-   - secure: "eOiuHs02lG2Uv146K9dMqucGTWUJFEhpz1oAtwe+kPrRXsXWc20hYMO+DSpMgD05vSvNeQA6p7h7LdRFQ+/g/Obj27TsOE+RKkUvRAtdwzxnKVyii9C/nmML8cFw7rIA0VS8O9mAkVYeyDxNDupBp3e9DPCibhKPvqCvioTnyy4="
-
-addons:
-  apt:
-    packages:
-      - tree
-  coverity_scan:
-    project:
-      name: "troglobit/finit"
-      description: "finit | Fast & Extensible init for Linux"
-    notification_email: troglobit@gmail.com
-    build_command_prepend: "./autogen.sh && ./configure --prefix= --disable-doc --disable-contrib --with-watchdog"
-    build_command: "make"
-    branch_pattern: dev
-
-install:
-  - 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
-  - tar xf libuev-2.3.2.tar.xz
-  - tar xf libite-2.3.1.tar.gz
-  - (cd libuev-2.3.2 && ./configure --prefix=/tmp && make && make install-strip)
-  - (cd libite-2.3.1 && ./configure --prefix=/tmp && make && make install-strip)
-
-# Custom build script for the time being, no "make test" yet
-script:
-  - ./autogen.sh
-  - ./configure --prefix= --enable-static
-  - make clean
-  - make V=1 -j5
-  - ./configure --prefix= --enable-x11-common-plugin --with-watchdog
-  - cat config.log
-  - make clean
-  - make V=1 -j5
-  - make install-strip DESTDIR=/tmp/finit
-  - tree /tmp/finit
-  - ldd /tmp/finit/sbin/finit
-  - size /tmp/finit/sbin/finit
-  - size /tmp/finit/sbin/initctl
-  - size /tmp/finit/sbin/reboot
-  - LD_LIBRARY_PATH=/tmp/lib /tmp/finit/sbin/initctl -h
-  - unshare -V
-  - nsenter -V
-  - chroot --version
-  - 'LD_LIBRARY_PATH=/tmp/lib make distcheck || (cat finit-4.0-beta1/_build/sub/test/test-suite.log; exit 1)'

ChangeLog.md

@@ -4,10 +4,136 @@ Change Log
 All relevant changes are documented in this file.
 
 
-[4.1][UNRELEASED]
------------------
+[4.3][UNRELEASED]
+--------------------
 
-Bug fix release.
+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
+* Loading `module`s no longer shows arguments in progress output
+* Warning messages in progress output now in yellow, not red, issue #214
+* `initctl`, new command line option `-v,--version` for ease of use
+* Extended environment variables for pre/post scripts, issue #189
+* New condition `done` for run task, issue #207 by Ming Liu, Atlas Copco
+* Refactor parts of shutdown and reboot sequence for PREEMPT-RT kernels,
+  by Robert Andersson, Mathias Thore, and Ming Liu, Atlas Copco
+* Conditions for run/task/sysv status, e.g. `run/foo/success` and
+  `task/bar/failure`.  Issue #232, by Ming Liu, Atlas Copco
+* initctl support for sending signals to services, by Jörgen
+  Sigvardsson, issue #225
+* `[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.  Documentation updated
+
+### Fixes
+* Fix nasty 32/64-bit alignment issue between finit and its plugins,
+  applicable to 32-bit targets with GLIBC 2.34 and later.  External
+  plugins must make sure to use, at least: `-D_TIME_BITS=64`
+* Fix #215: disable cgroup support at runtime if kernel lacks support
+  or does not have the required controllers (cpu)
+* Fix #217: iwatcher initialization issue, by Ming Liu, Atlas Copco
+* Fix #218: initctl matches too many services, by Ming Liu, Atlas Copco
+* 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 start/stop of SysV init scripts
+* 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.
+
+
+[4.2][] - 2022-01-16
+--------------------
+
+### Changes
+* Support for non-root users to use `initctl`, e.g. group wheel
+* Support for new libite (-lite) header namespace
+* RTC plugin now reset an invalid RTC time to the kernel default
+  time, 2000-01-01 00:00, prevents errors and is less crazy than
+  some systems coming with with <= Jan 1, 1970
+* urandom plugin now use RNDADDENTROPY ioctl to seed kernel rng,
+  incrementing entropy count.  Also, 32 kiB instead of 512 bytes are
+  now saved (and restored) on reboot.  This should greatly improve
+  reliability of systems with none or poor HWRNG
+* Kernel logging to console (loglevel >= 7, debug, when quiet mode is
+  not used) is now honored by Finit, regardless of the finit.debug
+  command line option
+* Reduced default log level from `LOG_NOTICE` to `LOG_INFO`
+* Wrapped all calls to mount(2) to add logging in case of failure
+* New configure options to control fastboot (no fsck) and fsck fix
+  options, by Ming Liu, Atlas Copco
+* Support for overriding default `/etc/nologin` file with an external
+  `#define`, by Ming Liu, Atlas Copco
+* Support for overriding default `/var/run/dbus/pid` file with an
+  external `#define`, by Ming Liu, Atlas Copco
+* Support for more service options to control respawn behavior of
+  crashing services, by Robert Andersson and Ming Liu, Atlas Copco
+* Support for `initctl ident [NAME]` which lists all instances of
+  `NAME`, or all enabled system run/tasks and services
+* Show number of total restarts and current respawn count for a
+  service in `initctl status foo`
+* Crashing services no longer have the crash/restart counter reset as
+  soon as they have stabilized.  Instead, a background timer will
+  slowly (every 300 sec) age (decrement) the counter.  This will still
+  catch services that "rage quit", but also those that crash after a
+  longer period of activity
+
+### Fixes
+* Fix #180: user managed (`manual:yes`) services accidentally started
+  by `initctl reload`, regression introduced in Finit v4.0
+* Fix #181: lots of typos all over the tree, by David Yang, Debian
+* Fix #187: fix typos, incl. small cleanup, in doc/bootstrap.md
+* Fix #188: support running on kernels that do not have cgroups v2.
+  When this is detect, all functions related to cgroups support in
+  Finit are disabled, *except* the .conf file parser.  Hence, you
+  may get parse error if you have invalid cgroup configuration in
+  your Finit .conf files
+* Fix #197: `initctl status foo` now shows a focused overview of all
+  matching instances; foo:1, foo:2 -- if only one instance matches the
+  command line argument, or if onle one instance exists, the detailed
+  view is shown, as before
+* Fix #198: a few typos found by Tim Gates
+* Fix #199: avoid using C++ reserved keywords
+* Fix #201: memory leak in usr condition plugin, by Ming Liu, Atlas Copco
+* Fix #203: ensure all filesystems listed in /proc/mounts are properly
+  unumounted on shutdown/reboot, by Robert Andersson, Atlas Copco
+* Fix #210: resizing terminal (smaller) after boot causes empty lines
+  to be inserted between boot progress
+* Fix #211: drop hard-coded 32 character limit in getty, now reads
+  `_SC_LOGIN_NAME_MAX` from `sysconf(3)`
+* Fix #212: service PID file lost after inictl reload, visible from
+  the output from `initctl status foo`
+
+
+[4.1][] - 2021-06-06
+--------------------
+
+Bug fix release.  Also disables handlers for `SIGINT` and `SIGPWR`, a
+new set of `sys` conditions are instead generated which can be used to
+trigger external programs.
 
 ### Changes
 * Change behavior on SIGUSR1 to be compatible with sysvinit and systemd.
@@ -16,17 +142,73 @@ Bug fix release.
   sysvinit (upgrading/reinstalling causes scripts to `kill -USR1 1`)
 * Change how `contrib/debian/install.sh` sets up a Grub boot entry for
   finit.  We now modify the $SUPPORTED_INITS variable in `10_linux`
+* Disable default kernel ctrl-alt-delete handler and let Finit instead
+  catch `SIGINT` from kernel to be able to perform a proper reboot.
+  There is no default command for this, you need to set up a task that
+  triggers on `<sys/key/ctrlaltdel>` to issue `initctl reboot`
+* Added keventd to provide `<sys/pwr/ac>` condition to Finit.  keventd
+  is currently only responsible for monitoring `/sys/class/power_supply`
+  for changes to active AC mains power online status.  Enable keventd
+  with `configure --with-keventd`
+* For handling power fail events (from UPS and similar) a process may
+  send `SIGPWR` to PID 1. Finit no longer redirects this to `SIGUSR1`
+  (poweroff).  There is no default command for this, you need to set up
+  a task that triggers on `<sys/pwr/fail>` to issue `initctl poweroff`
+* Built-in Finit getty is now a standalone program
+* Default termios for TTYs now enable `IUTF8` on input
+* If `/bin/login` is not found, Finit now tries `sulogin` before it
+  falls back to an unauthenticated `/bin/sh`
+* Dropped (broken) support for multiple consoles.  Finit now follows
+  the default console selected by the kernel, `/dev/console`
+* Dropped signal handlers for SIGSTOP/TSTP and SIGCONT
+* Added support for `\n`, in addition to `\r`, in "Please press Enter"
+  prompt before starting getty
+* Finit no longer parses `/proc/cmdline` for its options.  Instead all
+  options are by default now read from `argv[]`, like a normal program,
+  this is also what the kernel does by default.  Please note, this may
+  not work if your systems boots with an initramfs (ymmv), for such
+  cases, see `configure --enable-kernel-cmdline`
+* The following plugins are now possible to disable (for containers):
+  `rtc.so`, `urandom.so`, you may also want to disable `hotplug.so`.
+  They are all enabled by default, as in Finit 4.0, but may be moved
+  to external tools or entries in `finit.conf` in Finit 5.0
+* Added support for reading `PRETTY_NAME` from `/etc/os-release` to use
+  as heading in progress output, unless `--with-heading=GREET` is used.
+* Added manual pages for finit(8), initctl(8), and finit.conf(5)
 
 ### Fixes
 * Stricter interface name validation in netlink plugin, modeled after
   the kernel.  Suggested by Coverity Scan
+* Fix problem of re-registering a service as a task.  Previously, if a
+  fundamental change, like type, was made to an active service/run/task
+  it did not take.  Only possible workaround was to remove from config
+* initctl: drop warning when removing a non-existing usr condition
+* initctl: drop confusing `errno 0` when timing out waiting for reply
+* Ensure services in plugins and from Finit main belong to a cgroup
+* Ensure init top-level cgroup remains a leaf group
+* Fix tty parse error for detecting use of external getty
+* Fix default `name:` and `:ID` for tty's, e.g. `ttyS0` now gives
+  `tty:S0` as expected.  This was default for built-in getty already
+* Fix max username (32 chars) in bundled Finit getty
 * The `contrib/*/install.sh` scripts failed to run from tarball
+* Finit no longer forcibly mounts; `/dev`, `/proc`, or `/sys`, instead
+  it checks first if they are already mounted (devtmpfs or container)
+* Fix `/etc/fstab` parser to properly check for 'ro' to not remount the
+  root filesystem at boot.  The wrong field was read, so a root mounted
+  by an initramfs, or by lxc for a container, had their root remounted
+* Fix SIGCHLD handler, `waitpd()` may be interrupted by a signal
+* Reset `starting` flag of services being stopped.  When a service
+  is started and then stopped before it has created its pid file,
+  it could be left forever in the stopping state, unless we reset
+  the starting flag.
 * Fix #170: detect loss of default route when interfaces go down.  This
   emulates the missing kernel netlink message to remove the condition
   net/default/route to allow stopping dependent services
 * Fix #171: restore automatic mount of `/dev/shm`, `/dev/pts`, `/run`
   and `/tmp`, unless mounted already by `/etc/fstab`.  This is what most
-  desktop systems expect PID 1 to do
+  desktop systems expect PID 1 to do.  Here we also make sure to mount
+  `/run/lock` as a tmpfs as well, with write perms for regular users,
+  this prevents regular users from filling up `/run` and causing DoS.
 * Fix #173: netlink plugin runs out of socket buffer space;
 
         finit[1]: nl_callback():recv(): No buffer space available
@@ -38,6 +220,13 @@ Bug fix release.
 
         finit[1]: nl_callback():busy system, resynchronizing with kernel.
 
+* Fix #174: loss of log messages using combo of prio and facility, e.g.,
+  `logit(LOG_CONSOLE | LOG_NOTICE, ...)`, by Jacques de Laval, Westermo
+* Fix #175: ensure Finit does not acquire a controlling TTY when checking
+  if a device is a TTY before starting a getty.  This fixes an old bug
+  where Ctrl-C after logout from a shell could cause PID 1 to get SIGINT,
+  which in turn could lead to a system reboot
+
 
 [4.0][] - 2021-04-26
 --------------------
@@ -119,7 +308,7 @@ make sure to read the whole change log when upgrading.
   - As long as a stepped service changes state we queue another step all
     event, because services may depend on each other
 * Require new libuEv API: `uev_init1()` to reduce event cache so that
-  the kernel can invalidate deleted events before enqueing to userspace
+  the kernel can invalidate deleted events before enqueuing to userspace
 * Rename `hwclock.so` plugin to `rtc.so` since it now is stand-alone
   from the `hwclock` tool.  Note: the kernel can also be set to load
   and store RTC to/from system clock at boot/halt as well, issue #110
@@ -441,7 +630,7 @@ Bug fix release.
 
 * Add support for status/show service by `name:id`
 * Enforce terse mode after boot, if verbose mode is disabled
-* Reenable verbose mode at reboot, if disabled at boot
+* Re-enable verbose mode at reboot, if disabled at boot
 * Update section mentioning BusyBox getty
 * Update debugging documentation
 * Allow debug to override terse mode
@@ -496,7 +685,7 @@ handling and reconfiguration at runtime.
 * Clarify how to select different plugins with the configure script
 * Improve urandom plugin for embedded systems w/o random seed
 * Add `--debug` flag to `initctl`
-* The runlevels listed for services in `initctl show` now hightlight the
+* The runlevels listed for services in `initctl show` now highlight the
   active runlevel.
 * Clarify in the README and in `initctl help` that the GW event to
   listen for in service declarations is `GW:UP`
@@ -528,7 +717,7 @@ handling and reconfiguration at runtime.
 * Do not use `-Os` use `-O2` as default optimization level.  Many cross
   compiler toolchains are known to have problems with `-Os`
 * Do not allow build VERSION to be overloaded by an environment variable
-* Fix too small MAX arguments and too few argments in `svc_t` for
+* Fix too small MAX arguments and too few arguments in `svc_t` for
   reading currently running services with `initctl show`
 * Unblock blocked signals after forking off a child
 
@@ -628,7 +817,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
@@ -646,7 +835,7 @@ The inetd release.
   turned out to not work so well after all.  For instance, launching
   TTYs in a background process completely blocked inetd services from
   even starting up listening sockets ... proper fork seems to work fine
-  though.  This is the casue for *yanking* the [1.11] release, below.
+  though.  This is the cause for *yanking* the [1.11] release, below.
 * Trap segfaults caused by external plugins/callbacks in a sub-process.
   This prevents a single programming mistake in by a 3rd party developer
   from taking down the entire system.
@@ -659,7 +848,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
@@ -742,7 +931,7 @@ Major bug fix release.
 
 ### Changes
 * Show `__FILE__` in `_d()` debug messages, useful for plugins with
-  similarily named callbacks. Also, only in debug mode anyway
+  similarly named callbacks. Also, only in debug mode anyway
 * Make sure to cleanup recorded PID when a service is lost.  Required by
   service plugins for their callbacks to work.
 * Only clear screen when in verbose mode. Maybe this should be removed
@@ -910,7 +1099,10 @@ Major bug fix release.
 
 * Initial release
 
-[UNRELEASED]: https://github.com/troglobit/finit/compare/4.0...HEAD
+[UNRELEASED]: https://github.com/troglobit/finit/compare/4.2...HEAD
+[4.3]: https://github.com/troglobit/finit/compare/4.2...4.3
+[4.2]: https://github.com/troglobit/finit/compare/4.1...4.2
+[4.1]: https://github.com/troglobit/finit/compare/4.0...4.1
 [4.0]: https://github.com/troglobit/finit/compare/3.1...4.0
 [3.1]: https://github.com/troglobit/finit/compare/3.0...3.1
 [3.0]: https://github.com/troglobit/finit/compare/2.4...3.0

Makefile.am

@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS    = -I m4
-SUBDIRS            = plugins src test
+SUBDIRS            = man plugins src test
 doc_DATA           = README.md LICENSE contrib/finit.conf
 EXTRA_DIST         = README.md LICENSE ChangeLog.md contrib/finit.conf
 

README.md

@@ -1,4 +1,4 @@
-[![License Badge][]][License] [![Travis Status]][Travis] [![Coverity Status]][Coverity Scan]
+[![License Badge][]][License] [![GitHub Status][]][GitHub] [![Coverity Status][]][Coverity Scan]
 <img align="right" src="img/finit3.png" alt="Finit: Fast Init">
 
 * [Introduction](#introduction)
@@ -22,19 +22,19 @@
 Introduction
 ------------
 
-Finit is a simple alternative to [SysV init][4] and [systemd][6].  It
-was reverse engineered from the [EeePC fastinit][] over ten years ago
-by [Claudio Matsuoka][] — "gaps filled with frog DNA …"
+Fast init for Linux systems.  Reverse engineered from the [EeePC
+fastinit][] over ten years ago by [Claudio Matsuoka][] — "gaps filled
+with frog DNA …"
 
 ![Alpine screenshot](img/finit4-screenshot.png)  
 *Figure 1: Screenshot showing Finit booting [Alpine Linux](https://www.alpinelinux.org/).*
 
 Features include:
 
-  * Runlevels
-  * One-shot tasks, daemons, or SysV init scripts
-  * Runparts and rc.local
-  * Process supervision
+  * Runlevels, defined per service
+  * One-shot tasks, services (daemons), or [SysV init][4] start/stop scripts
+  * Runparts and `/etc/rc.local` support
+  * Process supervision similar to [systemd][]
   * Sourcing environment files
   * Conditions for network/process/custom dependencies
   * Pre/Post script actions
@@ -54,6 +54,11 @@ on server and desktop systems as well.  For working examples, see the
   * [Alpine Linux](contrib/alpine/), and
   * [Debian GNU/Linux](contrib/debian/)
 
+> **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 x86_64 systems.  Custom
+> setups, targeted at embedded systems, can be found in [myLinux][].
+
 
 Example
 -------
@@ -119,10 +124,10 @@ some of the most common components needed to start a UNIX daemon:
 
 ```
 service [LVLS] <COND> log env:[-]/etc/default/daemon daemon ARGS -- Daemon daemon
-^       ^      ^      ^   ^                          ^              ^       ^
-|       |      |      |   |                          |              |        `-- Optional description
-|       |      |      |   |                          |              `----------- Daemon arguments
-|       |      |      |   |                          `-------------------------- Path to daemon
+^       ^      ^      ^   ^                          ^      ^       ^
+|       |      |      |   |                          |      |        `---------- Optional description
+|       |      |      |   |                          |       `------------------ Daemon arguments
+|       |      |      |   |                           `------------------------- Path to daemon
 |       |      |      |    `---------------------------------------------------- Optional env. file
 |       |      |       `-------------------------------------------------------- Redirect output to log
 |       |       `--------------------------------------------------------------- Optional conditions
@@ -140,7 +145,7 @@ Dependencies are handled using [conditions](doc/conditions.md).  One of
 the most common conditions is to wait for basic networking to become
 available:
 
-    service <net/route/default> nginx -- High performace HTTP server
+    service <net/route/default> nginx -- High performance HTTP server
 
 Here is another example where we instruct Finit to not start BusyBox
 `ntpd` until `syslogd` has started properly.  Finit waits for `syslogd`
@@ -571,36 +576,35 @@ This project is based on the [original finit][] by [Claudio Matsuoka][]
 which was reverse engineered from syscalls of the [EeePC fastinit][] —
 "gaps filled with frog DNA …"
 
-Finit is developed and maintained by [Joachim Wiberg][] at [GitHub][].
+Finit is developed and maintained by [Joachim Wiberg][] at [GitHub][6].
 Please file bug reports, clone it, or send pull requests for bug fixes
 and proposed extensions.
 
 
-[1]:  https://en.wikipedia.org/wiki/Process_supervision
-[2]:  http://cr.yp.to/daemontools.html
-[3]:  http://smarden.org/runit/
-[4]:  http://en.wikipedia.org/wiki/Init
-[5]:  http://en.wikipedia.org/wiki/Runlevel
-[6]:  https://www.freedesktop.org/wiki/Software/systemd/
-[9]:  https://github.com/troglobit/troglos
+[1]:                https://en.wikipedia.org/wiki/Process_supervision
+[2]:                https://cr.yp.to/daemontools.html
+[3]:                https://smarden.org/runit/
+[4]:                https://en.wikipedia.org/wiki/Init
+[5]:                https://en.wikipedia.org/wiki/Runlevel
+[6]:                https://github.com/troglobit/finit
 [RFC862]:           https://tools.ietf.org/html/rfc862
 [RFC863]:           https://tools.ietf.org/html/rfc863
 [RFC864]:           https://tools.ietf.org/html/rfc864
 [RFC867]:           https://tools.ietf.org/html/rfc867
 [RFC868]:           https://tools.ietf.org/html/rfc868
-[init]:             http://en.wikipedia.org/wiki/Init
-[upstart]:          http://upstart.ubuntu.com/
-[systemd]:          http://www.freedesktop.org/wiki/Software/systemd/
-[openrc]:           http://www.gentoo.org/proj/en/base/openrc/
-[run-parts(8)]:     http://manpages.debian.org/cgi-bin/man.cgi?query=run-parts
+[init]:             https://en.wikipedia.org/wiki/Init
+[upstart]:          https://upstart.ubuntu.com/
+[systemd]:          https://www.freedesktop.org/wiki/Software/systemd/
+[openrc]:           https://www.gentoo.org/proj/en/base/openrc/
+[run-parts(8)]:     https://manpages.debian.org/cgi-bin/man.cgi?query=run-parts
 [original finit]:   http://helllabs.org/finit/
 [EeePC fastinit]:   https://web.archive.org/web/20071208212450/http://wiki.eeeuser.com/boot_process:the_boot_process
 [Claudio Matsuoka]: https://github.com/cmatsuoka
-[Joachim Wiberg]:   http://troglobit.com
-[GitHub]:           https://github.com/troglobit/finit
+[Joachim Wiberg]:   https://troglobit.com
 [License]:          https://en.wikipedia.org/wiki/MIT_License
 [License Badge]:    https://img.shields.io/badge/License-MIT-teal.svg
-[Travis]:           https://travis-ci.org/troglobit/finit
-[Travis Status]:    https://travis-ci.org/troglobit/finit.svg?branch=master
+[GitHub]:           https://github.com/troglobit/myLinux/
+[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
 [Coverity Status]:  https://scan.coverity.com/projects/3545/badge.svg

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Finit, 4.1-rc1, https://github.com/troglobit/finit/issues, finit, https://troglobit.com/finit.html)
+AC_INIT(Finit, 4.3-rc1, https://github.com/troglobit/finit/issues, finit, https://troglobit.com/finit.html)
 AC_CONFIG_AUX_DIR(aux)
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects])
 AM_SILENT_RULES([yes])
@@ -11,10 +11,11 @@ AC_CONFIG_FILES([Makefile
 	contrib/debian/Makefile contrib/debian/finit.d/Makefile contrib/debian/finit.d/available/Makefile
 	contrib/void/Makefile   contrib/void/finit.d/Makefile   contrib/void/finit.d/available/Makefile
 	doc/Makefile
+	man/Makefile
 	plugins/Makefile
 	src/Makefile
-	test/test.env
-	test/Makefile])
+	test/test.env test/Makefile
+	test/tenv/Makefile test/common/Makefile])
 
 # Older versions of autoconf (<2.58) do not have AC_CONFIG_MACRO_DIR()
 #m4_include([m4/plugin.m4])
@@ -52,6 +53,18 @@ AC_ARG_ENABLE(auto_reload,
         AS_HELP_STRING([--enable-auto-reload], [Automatic reload on any .conf change]),,[
 	enable_auto_reload=no])
 
+AC_ARG_ENABLE(kernel_cmdline,
+        AS_HELP_STRING([--enable-kernel-cmdline], [Parse init args from /proc/cmdline (don't use!)]),,[
+	enable_kernel_cmdline=no])
+
+AC_ARG_ENABLE(fastboot,
+        AS_HELP_STRING([--enable-fastboot], [Skip fsck check on filesystems listed in /etc/fstab]),,[
+	enable_fastboot=no])
+
+AC_ARG_ENABLE(fsckfix,
+        AS_HELP_STRING([--enable-fsckfix], [Run fsck fix mode (options: -yf) on filesystems listed in /etc/fstab]),,[
+	enable_fsckfix=no])
+
 AC_ARG_ENABLE(redirect,
         AS_HELP_STRING([--disable-redirect], [Disable redirection of service output to /dev/null]),,[
 	enable_redirect=yes])
@@ -73,14 +86,18 @@ enable_all_plugins=auto
 AC_PLUGIN([alsa-utils],    [no],  [Save and restore ALSA sound settings using alsactl])
 AC_PLUGIN([dbus],          [no],  [Setup and start system message bus, D-Bus])
 AC_PLUGIN([modules-load],  [no],  [Scans /etc/modules-load.d for modules to load])
+AC_PLUGIN([modprobe],      [yes], [Coldplug modules using modalias magic])
 AC_PLUGIN([resolvconf],    [no],  [Setup necessary files for resolvconf])
 AC_PLUGIN([x11-common],    [no],  [Console setup (for X)])
 AC_PLUGIN([netlink],       [yes], [Basic netlink plugin for IFUP/IFDN and GW events. Can be replaced with externally built plugin that links with libnl or similar.])
 AC_PLUGIN([hotplug],       [yes], [Setup and start udev or mdev hotplug daemon])
+AC_PLUGIN([rtc],           [yes], [Save and restore RTC using hwclock])
+AC_PLUGIN([tty],           [yes], [Automatically activate new TTYs, e.g. USB-to-serial])
+AC_PLUGIN([urandom],       [yes], [Setup and save random seed at boot/shutdown])
 
 # Check for extra arguments or packages
 AC_ARG_WITH(heading,
-        AS_HELP_STRING([--with-heading=GREET], [Display GREET instead of Finit version at boot]),
+        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])
 
 AC_ARG_WITH(config,
@@ -99,6 +116,10 @@ AC_ARG_WITH(sysconfig,
         AS_HELP_STRING([--with-sysconfig=DIR], [System environment directory, sourced by .conf files, default /etc/default & /etc/conf.d]),
 	[sysconfig=$withval], [sysconfig=default])
 
+AC_ARG_WITH(group,
+	AS_HELP_STRING([--with-group=NAME], [Group for /run/finit/socket (initctl), default: root]),
+	[group=$withval], [group=root])
+
 AC_ARG_WITH(hostname,
         AS_HELP_STRING([--with-hostname=NAME], [If /etc/hostname is missing, default: noname]),
 	[hostname=$withval], [hostname=yes])
@@ -111,6 +132,9 @@ AC_ARG_WITH(random-seed,
         AS_HELP_STRING([--with-random-seed=FILE], [Save a random seed for /dev/urandom across reboots, default /var/lib/misc/random-seed]),
 	[random_seed=$withval], [random_seed=yes])
 
+AC_ARG_WITH(keventd,
+        AS_HELP_STRING([--with-keventd], [Enable built-in keventd, default: no]),, [with_keventd=no])
+
 AC_ARG_WITH(watchdog,
         AS_HELP_STRING([--with-watchdog=[DEV]], [Enable built-in watchdog, default: /dev/watchdog]),
 	[watchdog=$withval], [with_watchdog=no watchdog=])
@@ -121,6 +145,15 @@ AC_ARG_WITH(watchdog,
 AS_IF([test "x$enable_auto_reload" = "xyes"], [
         AC_DEFINE(AUTO_RELOAD, 1, [Finit automatically does `initctl reload` on any .conf change])])
 
+AS_IF([test "x$enable_kernel_cmdline" = "xyes"], [
+        AC_DEFINE(KERNEL_CMDLINE, 1, [Dumpster diving after init args from /proc/cmdline])])
+
+AS_IF([test "x$enable_fastboot" = "xyes"], [
+	AC_DEFINE(FAST_BOOT, 1, [Skip fsck check on filesystems listed in /etc/fstab])])
+
+AS_IF([test "x$enable_fsckfix" = "xyes"], [
+	AC_DEFINE(FSCK_FIX, 1, [Run fsck fix mode (options: -yf) on filesystems listed in /etc/fstab])])
+
 AS_IF([test "x$enable_redirect" = "xyes"], [
 	AC_DEFINE(REDIRECT_OUTPUT, 1, [Enable redirection of service output to /dev/null])])
 
@@ -158,9 +191,13 @@ AS_IF([test "x$with_sysconfig" != "xno"], [
 			    [System environment, default /etc/default & /etc/conf.d])])])
 
 AS_IF([test "x$with_heading" != "xno"], [
-	AS_IF([test "x$heading" = "xyes"], [
-		heading="$PACKAGE_NAME v$PACKAGE_VERSION"])])
-AC_DEFINE_UNQUOTED(INIT_HEADING, "$heading", [Displayed by Finit at boot])
+	AS_IF([test "x$heading" = "xyes"], [heading=""])
+	AC_DEFINE_UNQUOTED(INIT_OSHEADING, "$heading", [Displayed by Finit at boot, defaults to /etc/os-release PRETTY_NAME])])
+
+AS_IF([test "x$with_group" != "xno"], [
+	AS_IF([test "x$group" = "xyes"], [
+		group=root])])
+AC_DEFINE_UNQUOTED(DEFGROUP, "$group", [For /run/finit/socket])
 
 AS_IF([test "x$with_hostname" != "xno"], [
 	AS_IF([test "x$hostname" = "xyes"], [
@@ -179,6 +216,8 @@ AS_IF([test "x$with_random_seed" != "xno"], [
 	AC_EXPAND_DIR(random_path, "$random_seed")
 	AC_DEFINE_UNQUOTED(RANDOMSEED, "$random_path", [Improve random at boot by seeding it with sth from before.])])
 
+AS_IF([test "x$with_keventd" != "xno"], [with_keventd=yes])
+
 AS_IF([test "x$with_watchdog" != "xno"], [
 	AS_IF([test "x$watchdog" = "xyes"], [
 		watchdog=/dev/watchdog])
@@ -188,6 +227,7 @@ AS_IF([test "x$with_watchdog" != "xno"], [
 
 # Control build with automake flags
 AM_CONDITIONAL(STATIC,    [test "x$enable_static" = "xyes"])
+AM_CONDITIONAL(KEVENTD,   [test "x$with_keventd"  != "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"])
@@ -207,6 +247,9 @@ AC_DEFINE_UNQUOTED(RESCUE_CONF, "$rescue_conf", [Finit rescue mode .conf])
 AC_EXPAND_DIR(sample_conf, "$libdir/finit/sample.conf")
 AC_DEFINE_UNQUOTED(SAMPLE_CONF, "$sample_conf", [Finit sameple.conf for initctl create])
 
+AS_IF([test "$heading" = ""],   [heading="<DEFAULT>"])
+AS_IF([test "$heading" = "no"], [heading="<NONE>"])
+
 # Generate all files
 AC_OUTPUT
 
@@ -234,10 +277,14 @@ Behavior:
 Optional features:
   Install doc/..........: $enable_doc
   Install contrib/......: $enable_contrib
+  Built-in keventd......: $with_keventd
   Built-in watchdogd....: $with_watchdog $watchdog
   Built-in logrotate....: $enable_logrotate
+  Skip fsck check.......: $enable_fastboot
+  Run fsck fix mode.....: $enable_fsckfix
   Redirect output.......: $enable_redirect
   Default hostname......: $hostname
+  Default group.........: $group
   Default runlevel......: $runlevel
 
 ------------- Compiler version --------------

contrib/alpine/Makefile.am

@@ -1,5 +1,5 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/alpine
-docs_DATA  = README.md finit.conf alpine-release build.sh install.sh rc.local
+docs_DATA  = README.md finit.conf build.sh install.sh rc.local
 EXTRA_DIST = $(docs_DATA)
 

contrib/alpine/alpine-release

@@ -1 +0,0 @@
-3.6.2

contrib/alpine/build.sh

@@ -18,7 +18,7 @@ PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure	\
 		 --sysconfdir=/etc		--localstatedir=/var		\
 		 --enable-dbus-plugin		--enable-x11-common-plugin	\
 		 --enable-alsa-utils-plugin	--with-watchdog			\
-		 --with-heading="Alpine Linux 3.13"
+		 --with-keventd
 
 echo
 echo "*** Building ..."

contrib/alpine/finit.conf

@@ -5,6 +5,22 @@
 # Default is 2
 #runlevel 2
 
+# Top-level cgroups and their default settings.  All groups mandatory
+# but more can be added, max 8 groups in total currently.  The cgroup
+# 'root' is also available, reserved for RT processes.  Settings are
+# as-is, only one shorthand 'mem.' exists, other than that it's the
+# cgroup v2 controller default names.
+#cgroup init   cpu.weight:100
+#cgroup user   cpu.weight:100
+#cgroup system cpu.weight:9700
+
+# Task to run if ctrl-alt-del is pressed.  This condition is asserted by
+# Finit upon receiving SIGINT (from the kernel).
+#task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+
+# Task to run if the kernel gets a power fail condition is pressed.
+# Asserted by Finit upon receiving SIGPWR (from the kernel).
+#task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+
 ## Bootstrap services and tasks
 # Can be listed here or in /etc/finit.d/*.conf
-

contrib/alpine/install.sh

@@ -8,7 +8,8 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-if [ -e alpine-release ]; then
+grep -q alpine Makefile 2>/dev/null
+if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then
     echo "*** Please run this script from the Finit base directory."

contrib/alpine/rc.local

@@ -4,5 +4,5 @@
 #
 # Each line is run in sequence.
 #
-# NOTE: Remeber to set the executable bit!
+# NOTE: Remember to set the executable bit!
 #

contrib/debian/Makefile.am

@@ -1,4 +1,4 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/debian
-docs_DATA  = README.md finit.conf os-release build.sh install.sh
+docs_DATA  = README.md finit.conf build.sh install.sh
 EXTRA_DIST = $(docs_DATA)

contrib/debian/README.md

@@ -47,12 +47,13 @@ comands to `initctl`, followed by `reload` to activate your changes.
 You can also use a standard [/etc/rc.local](rc.local) for one-shot tasks
 and initialization like keyboard language etc.
 
-If you want to use the X Window system, `sudo apt install elogind`
-(Bullseye and later).  Followed by `initctl reload` (enabled by default)
-and logout/login again.  The elogind daemon ensures a regular non-root
-user can start and interact with an X session, otherwise keyboard and
-mouse won't work.  When you're happy, you can enable the lightdm.conf,
-change the default runlevel to 3, and presto! you have a desktop again.
+> **NOTE:** X Window system, you may need to `sudo apt install elogind`
+> (Bullseye and later), followed by `initctl reload` to activate it (it
+> is enabled by default), and logout/login again.  The elogind daemon
+> ensures a regular non-root user can start and interact with an X
+> session, otherwise keyboard and mouse won't work.  When you're happy,
+> you can enable the lightdm.conf, change the default runlevel to 3, and
+> presto!  you have a desktop again.
 
 
 Have fun!  

contrib/debian/build.sh

@@ -25,9 +25,8 @@ echo
     --prefix=/usr                     --exec-prefix=			\
     --sysconfdir=/etc                 --localstatedir=/var		\
     --enable-dbus-plugin              --enable-x11-common-plugin	\
-    --enable-alsa-utils-plugin						\
-    --with-random-seed=/var/lib/urandom/random-seed			\
-    --with-heading="Debian GNU/Linux"
+    --enable-alsa-utils-plugin	      --with-keventd			\
+    --with-random-seed=/var/lib/urandom/random-seed
 
 if [ $? -ne 0 ]; then
     echo

contrib/debian/finit.conf

@@ -5,6 +5,22 @@
 # Default is 2
 #runlevel 2
 
+# Top-level cgroups and their default settings.  All groups mandatory
+# but more can be added, max 8 groups in total currently.  The cgroup
+# 'root' is also available, reserved for RT processes.  Settings are
+# as-is, only one shorthand 'mem.' exists, other than that it's the
+# cgroup v2 controller default names.
+#cgroup init   cpu.weight:100
+#cgroup user   cpu.weight:100
+#cgroup system cpu.weight:9700
+
+# Task to run if ctrl-alt-del is pressed.  This condition is asserted by
+# Finit upon receiving SIGINT (from the kernel).
+#task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+
+# Task to run if the kernel gets a power fail condition is pressed.
+# Asserted by Finit upon receiving SIGPWR (from the kernel).
+#task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+
 ## Bootstrap services and tasks
 # Can be listed here or in /etc/finit.d/*.conf
-

contrib/debian/finit.d/Makefile.am

@@ -1,9 +1,9 @@
 SUBDIRS    = available
 docsdir   := @docdir@/contrib/debian/finit.d
-d_LINKS    = acpid.conf apparmor.conf avahi-demon.conf		\
+d_LINKS    = acpid.conf apparmor.conf avahi-daemon.conf		\
 	     bluetooth.conf console-setup.conf elogind.conf 	\
 	     getty.conf keyboard-setup.conf modules.conf	\
-	     rsyslogd.conf sshd.conf
+	     plymouth-quit.conf rsyslogd.conf sshd.conf
 
 install-exec-hook:
 	@$(MKDIR_P) $(DESTDIR)$(docsdir)/available

contrib/debian/finit.d/available/Makefile.am

@@ -2,6 +2,7 @@ docsdir   := @docdir@/contrib/debian/finit.d/available
 docs_DATA  = acpid.conf apparmor.conf avahi-daemon.conf bluetooth.conf	\
 	     console-setup.conf elogind.conf getty.conf			\
 	     keyboard-setup.conf lightdm.conf modules.conf sntpd.conf	\
-	     rsyslogd.conf sshd.conf syslogd.conf xdm.conf
+	     plymouth-quit.conf rsyslogd.conf sshd.conf syslogd.conf	\
+	     xdm.conf
 EXTRA_DIST = $(docs_DATA)
 

contrib/debian/finit.d/available/plymouth-quit.conf

@@ -0,0 +1,2 @@
+# Need to stop plymouth, or it'll block stdin on tty1
+task [S] /usr/bin/plymouth quit -- Stopping Plymouth Boot Screen

contrib/debian/install.sh

@@ -8,7 +8,7 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-grep -q Debian os-release 2>/dev/null
+grep -q debian Makefile 2>/dev/null
 if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then

contrib/debian/os-release

@@ -1,8 +0,0 @@
-PRETTY_NAME="Debian GNU/Linux 8 (jessie)"
-NAME="Debian GNU/Linux"
-VERSION_ID="8"
-VERSION="8 (jessie)"
-ID=debian
-HOME_URL="http://www.debian.org/"
-SUPPORT_URL="http://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"

contrib/finit.conf

@@ -35,6 +35,14 @@ tty /dev/tty1
 tty /dev/tty2
 tty /dev/tty3
 
+# Task to run if ctrl-alt-del is pressed.  This condition is asserted by
+# Finit upon receiving SIGINT (from the kernel).
+task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+
+# Task to run if the kernel gets a power fail condition is pressed.
+# Asserted by Finit upon receiving SIGPWR (from the kernel).
+task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+
 # Alternative method instead of runparts
 #task [S] /etc/init.d/keyboard-setup start -- Setting up preliminary keymap
 #task [S] /etc/init.d/acpid start          -- Starting ACPI Daemon

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

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

contrib/void/Makefile.am

@@ -1,4 +1,4 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/void
-docs_DATA  = README.md finit.conf build.sh install.sh rc.local xbps
+docs_DATA  = README.md finit.conf build.sh install.sh rc.local
 EXTRA_DIST = $(docs_DATA)

contrib/void/build.sh

@@ -18,7 +18,7 @@ PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure	\
 		 --sysconfdir=/etc              --localstatedir=/var		\
                  --enable-dbus-plugin           --enable-x11-common-plugin	\
 		 --enable-alsa-utils-plugin	--with-watchdog			\
-		 --with-heading="Void Linux"
+		 --with-keventd
 
 echo
 echo "*** Building ..."

contrib/void/finit.conf

@@ -5,5 +5,22 @@
 # Default is 2
 #runlevel 2
 
+# Top-level cgroups and their default settings.  All groups mandatory
+# but more can be added, max 8 groups in total currently.  The cgroup
+# 'root' is also available, reserved for RT processes.  Settings are
+# as-is, only one shorthand 'mem.' exists, other than that it's the
+# cgroup v2 controller default names.
+#cgroup init   cpu.weight:100
+#cgroup user   cpu.weight:100
+#cgroup system cpu.weight:9700
+
+# Task to run if ctrl-alt-del is pressed.  This condition is asserted by
+# Finit upon receiving SIGINT (from the kernel).
+#task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+
+# Task to run if the kernel gets a power fail condition is pressed.
+# Asserted by Finit upon receiving SIGPWR (from the kernel).
+#task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+
 ## Bootstrap services and tasks
 # Can be listed here or in /etc/finit.d/*.conf

contrib/void/install.sh

@@ -8,7 +8,8 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-if [ -e xbps ]; then
+grep -q void Makefile 2>/dev/null
+if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then
     echo "*** Please run this script from the Finit base directory."

contrib/void/rc.local

@@ -4,4 +4,4 @@
 #
 # Each line is run in sequence.
 #
-# NOTE: Remeber to set the executable bit!
+# NOTE: Remember to set the executable bit!

doc/TODO.md

@@ -21,11 +21,17 @@ Some of these are also registered in the issue tracker on GitHub.
 * Allow running as non-pid1 => read .conf and RCSD form cmdline
 * Add `finit.conf` support for UPS notification (SIGPWR) to start a task
   using, e.g. <sys/power/{ok,fail,low}> conditions.  More info in sig.c
+
+  As of Finit v4.1 SIGPWR generates <sys/power/fail> condition and it
+  is up to a task to check why and take appropriate action.
 * Add `finit.conf` support for ctrl-alt-delete (SIGINT) and kbrequest,
   i.e. KeyboardSignal, (SIGWINCH) behavior.  Using conditions to a task,
   e.g, <sys/key/ctrlaltdel> and <sys/key/signal> like SIGPWR handling.
-* Write man pages for finit and `finit.conf`, steal from the excellent
-  `pimd` man pages ...
+
+  As of Finit v4.1 SIGINT generates <sys/key/ctrlaltdel>, but there is
+  no check if the signal actually originates from the kernel.  To get
+  this verification, a new libuEv release is needed.  As of June 6 -21
+  that functionality is not yet released.
 
 
 Initctl

doc/bootstrap.md

@@ -16,7 +16,9 @@ Bootstrap
 11. Load all `/etc/finit.d/*.conf` files and set hostname
 12. Remount `/` read-write if `/` is listed in `/etc/fstab` without `ro`
 13. Call 1st level hooks, `HOOK_ROOTFS_UP`
-14. Mount all file systems listed in `/etc/fstab` and swap, if available
+14. Mount all file systems listed in `/etc/fstab` and swap, if available.
+    On mount error `HOOK_MOUNT_ERROR` is called.  After mount, regardless
+    of error, `HOOK_MOUNT_POST` is called
 15. Enable SysV init signals
 16. Call 2nd level hooks, `HOOK_BASEFS_UP`
 17. Cleanup stale files from `/tmp/*` et al, handled by `bootmisc` plugin
@@ -38,16 +40,13 @@ Bootstrap
 26. Call 5th level (last) hooks, `HOOK_SYSTEM_UP`
 27. Start all configured TTYs
 
-In (19) and (22) tasks and services defined in `/etc/finit.conf` and
-`/etc/sysctl.d/*.conf` are started.  Remember, all `service` and `task`
-stanzas are started in parallel and `run` in sequence, and in the order
-listed.  Hence, to emulate a SysV `/etc/init.d/rcS` one could write a
-long `finit.conf` with only `run` statements.
+In (19) and (23) tasks and services defined in `/etc/finit.conf` and
+`/etc/finit.d/*.conf` are started.
 
-Notice the five hook points that are called at various point in the
-bootstrap process.  This is where plugins can extend the boot in any way
-they please.  There are other hook points, e.g. `HOOK_MOUNT_ERROR`, for
-more on this see [plugins.md](plugins.md).
+Notice the seven hook points that are called at various point in the
+bootstrap process.  This is where plugins can extend the boot in any
+way they please.  There are other hook points available, for more on
+this, see [plugins.md](plugins.md).
 
 For instance, at `HOOK_BASEFS_UP` a plugin could read an XML file from a
 USB stick, convert/copy its contents to the system's `/etc/` directory,

doc/build.md

@@ -27,10 +27,10 @@ optional plugins to enable.  It depends on two external libraries:
     PKG_CONFIG_LIBDIR=/usr/local/lib/pkgconfig ./configure
 
 The configure script checks for all dependencies, including the correct
-version of the above mentioned libraries.  Currently requried versions:
+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
@@ -53,6 +53,10 @@ Below are a few of the main switches to configure:
   built-ins (.o files) and all external libraries, except the C library
   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
+  init for container apps that can see the host's `/proc` filesystem
+
 * `--enable-alsa-utils-plugin`: Enable the optional `alsa-utils.so` sound plugin.
 
 * `--enable-dbus-plugin`: Enable the optional D-Bus `dbus.so` plugin.
@@ -63,6 +67,13 @@ Below are a few of the main switches to configure:
 
 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
 -------
@@ -70,16 +81,16 @@ Example
 First, unpack the archive:
 
 ```shell
-$ tar xf finit-3.0.tar.xz
-$ cd finit-3.0/
+$ tar xf finit-4.3.tar.gz
+$ cd finit-4.3/
 ```
 
 Then configure, build and install:
 
 ```shell
-$ ./configure --prefix=/usr                 --exec-prefix=                    \
-              --sysconfdir=/etc             --localstatedir=/var              \
-              --with-heading="Alpine Linux 3.13" --with-hostname=alpine
+$ ./configure --prefix=/usr                 --exec-prefix=         \
+              --sysconfdir=/etc             --localstatedir=/var   \
+              --with-keventd                --with-watchdog
 $ make
 .
 .
@@ -87,13 +98,13 @@ $ make
 $ DESTDIR=/tmp/finit make install
 ```
 
-In this example the [finit-3.0.tar.xz][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
 standalone packages.
 
-Finit 3.0 and later can detect if it runs on an embedded system, or a
+Finit 4.1 and later can detect if it runs on an embedded system, or a
 system that use BusyBox tools instead of udev & C:o.  On such systems
 `mdev` instead of `udev` is used.  However, remember to also change the
 Linux config to:
@@ -147,12 +158,14 @@ 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:
 
@@ -171,6 +184,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-3.0.tar.xz
+[1]:       ftp://troglobit.com/finit/finit-4.3.tar.gz
 [libuEv]:  https://github.com/troglobit/libuev
 [libite]:  https://github.com/troglobit/libite

doc/cmdline.md

@@ -6,15 +6,17 @@ passed on the Linux kernel command line.  Not limited to Finit.
 
 The `bool` setting is one of `on, off, true false, 1, 0`.
 
+> **NOTE:** remember to use `--` to separate kernel parameters from
+> 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.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.
@@ -24,11 +26,18 @@ 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),
@@ -42,7 +51,7 @@ The `bool` setting is one of `on, off, true false, 1, 0`.
     `[1]` will be started, so a `tty [1] @console nologin` configuration
     presents you with a root console without login.
 
-For more on kernel boot paramaters, see the man page [bootparam(7)][].
+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

doc/conditions.md

@@ -87,12 +87,15 @@ Static (one-shot) conditions, like `usr/`, never enter the `flux` state.
 Built-in Conditions
 -------------------
 
-Finit comes with a `pidfile` and `netlink` plugin.  When enabled, the
-`pidfile` plugin watches `/var/run/` (recursively) for PID files created
-by the monitored services, and sets a corresponding condition in the
-`pid/` namespace.  Similarily, the `netlink` plugin provides basic
-conditions for when an interface is brought up/down and when a default
-route (gateway) is set, in the `net/` namespace.
+Finit comes with a set of plugins for conditions: `pidfile`, `netlink`,
+`sys`, and `usr`.  The `pidfile` plugin (recursively) watches `/run/`
+(recursively) for PID files created by the monitored services, and sets
+a corresponding condition in the `pid/` namespace.  Similarly, the
+`netlink` plugin provides basic conditions for when an interface is
+brought up/down and when a default route (gateway) is set, in the `net/`
+namespace.  The `sys` and `usr` plugins monitor are passive condition
+monitors where the action is provided by `keventd`, signal handlers,
+and in the case of `usr`, the end-user via the `initctl` tool
 
 With the example listed above, finit does not start the `/sbin/netd`
 daemon until `setupd` and `zebra` has started *and* created their PID
@@ -111,6 +114,10 @@ Built-in conditions:
 - `net/<IFNAME>/exist`
 - `net/<IFNAME>/up`
 - `net/<IFNAME>/running`
+- `sys/pwr/ac`
+- `sys/pwr/fail`
+- `sys/key/ctrlaltdel`
+- `usr/foo`
 
 **Note:** `up` means administratively up, the interface flag `IFF_UP`.
   `running` is the `IFF_RUNNING` flag, meaning operatively up.  The
@@ -173,7 +180,7 @@ PID     IDENT         STATUS  CONDITION (+ ON, ~ FLUX, - OFF)
 
 Here we can see that `netd` is allowed to run since both its conditions
 are in the `on` state, as indicated by the `+`-prefix.  `udhcpc` however
-is not allowed to run since `net/vlan1/exist` condition is not satsifed.
+is not allowed to run since `net/vlan1/exist` condition is not satisfied.
 As indicated by the `-`-prefix.
 
 To fake interface `vlan1` suddenly appearing, and test what happens to

doc/config.md

@@ -26,6 +26,7 @@ Configuration
   * [/etc/finit.conf](#etcfinitconf)
   * [/etc/finit.d](#etcfinitd)
 * [Watchdog](#watchdog)
+* [keventd](#keventd)
 
 
 Introduction
@@ -42,13 +43,13 @@ Not all configuration directives are available in `/etc/finit.d/*.conf`
 and some directives are only available at [bootstrap][], runlevel `S`,
 see the section [Limitations](#limitations) below for details.
 
-To add a new service, simply drop a `.conf` file in `/etc/finit.d` and
-run `initctl reload`.  (It is also possible to `SIGHUP` to PID 1, or
-call `finit q`, but that has been deprecated with the `initctl` tool).
-Finit monitors all known active `.conf` files, so if you want to force
-a restart of any service you can simply touch its corresponding `.conf`
-file in `/etc/finit.d` and call `initctl reload`.  Finit handle any
-and all conditions and dependencies between services automatically.
+To add a new service, drop a `.conf` file in `/etc/finit.d` and run
+`initctl reload`.  (It is also possible to `SIGHUP` to PID 1, or call
+`finit q`, but that has been deprecated with the `initctl` tool).  Finit
+monitors all known active `.conf` files, so if you want to force a
+restart of any service you can touch its corresponding `.conf` file in
+`/etc/finit.d` and call `initctl reload`.  Finit handle any and all
+conditions and dependencies between services automatically.
 
 It is also possible to drop `.conf` files in `/etc/finit.d/available/`
 and use `initctl enable` to enable a service `.conf` file.  This may be
@@ -58,7 +59,7 @@ files for a package and let the user decide when to enable a service.
 On `initctl reload` the following is checked for all services:
 
 - If a service's `.conf` file has been removed, or its conditions are no
-  longer satisifed, the service is stopped.
+  longer satisfied, the service is stopped.
 - If the file is modified, or a service it depends on has been reloaded,
   the service is reloaded (stopped and started).
 - If a new service is added it is automatically started — respecting
@@ -153,7 +154,7 @@ Top-level group configuration.
     cgroup system cpu.weight:9800
 
 Adding an extra cgroup `maint/` will require you to adjust the weight of
-the above three.  We leave `init/` and `user /` as-is reducing weight of
+the above three.  We leave `init/` and `user/` as-is reducing weight of
 `system/` to 9700.
 
     cgroup system cpu.weight:9700
@@ -183,7 +184,7 @@ The latter form also allows per-stanza limits on the form:
 
 Notice the comma separation and the `mem.` exception to the rule: every
 cgroup setting maps directly to cgroup v2 syntax.  I.e., `cpu.max` maps
-to the file `/sys/fs/cgroup/maint/foo/cpu.max`.  There is not filtering,
+to the file `/sys/fs/cgroup/maint/foo/cpu.max`.  There is no filtering,
 except for expanding the shorthand `mem.` to `memory.`, if the file is
 not available, either the cgroup controller is not available in your
 Linux kernel, or the name is misspelled.
@@ -322,6 +323,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.
 
@@ -331,8 +336,11 @@ by declaring the PID file to look for: `pid:!/path/to/pidfile.pid`.
 **Syntax:** `service [LVLS] <COND> /path/to/daemon ARGS -- Optional description`
 
 Service, or daemon, to be monitored and automatically restarted if it
-exits prematurely.  Finit tries to restart services that die 10 times
-before giving up, then you have to `initctl restart NAME` it manually.
+exits prematurely.  Finit tries to restart services that die, by
+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.
   
 For daemons that support it, we recommend appending `--foreground`,
 `--no-background`, `-n`, `-F`, or similar command line argument to
@@ -340,9 +348,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:**
 
@@ -389,6 +407,21 @@ optional `name` argument:
 
     name:<service-name>
 
+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`
+  * `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`
+  * `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
+
 When stopping a service (run/task/sysv/service), either manually or
 when moving to another runlevel, Finit starts by sending `SIGTERM`, to
 allow the process to shut down gracefully.  If the process has not
@@ -472,8 +505,9 @@ size limit is reached.
   `tty [LVLS] <COND> [notty] [rescue]`
 
 The first variant of this option uses the built-in getty on the given
-TTY device DEV, in the given runlevels.  The DEV may be the special
-keyword `@console`, or `console`, useful on embedded systems.
+TTY device DEV, in the given runlevels.  DEV may be the special keyword
+`@console`, which is expanded from `/sys/class/tty/console/active`,
+useful on embedded systems.
 
 The default baud rate is 0, i.e., keep kernel default.
 
@@ -554,8 +588,8 @@ One can also use the `service` stanza to start a stand-alone shell:
 ### Non-privileged Services
 
 Every `run`, `task`, or `service` can also list the privileges the
-`/path/to/cmd` should be executed with.  Simply prefix the path with
-`[@USR[:GRP]]` like this:
+`/path/to/cmd` should be executed with.  Prefix the command with
+`@USR[:GRP]`, group is optional, like this:
 
     run [2345] @joe:users logger "Hello world"
 
@@ -653,8 +687,9 @@ Limitations
 -----------
 
 As of Finit v4 there are no limitations to where `.conf` settings can be
-placed.  Except for the system/global `rlimit`, which can only be set
-from `/etc/finit.conf`, since it is the first `.conf` file Finit reads.
+placed.  Except for the system/global `rlimit` and `cgroup` top-level
+group declarations, which can only be set from `/etc/finit.conf`, since
+it is the first `.conf` file Finit reads.
 
 Originally, `/etc/finit.conf` was the only way to set up a Finit system.
 Today it is mainly used for bootstrap settings like system hostname,
@@ -704,3 +739,19 @@ the only option is to remove `/libexec/finit/watchdogd` or build without
 it at configure time.
 
 [bootstrap]: bootstrap.md
+
+
+keventd
+-------
+
+The kernel event daemon bundled with Finit is a simple uevent monitor
+for `/sys/class/power_supply`.  It provides the `sys/pwr/ac` condition,
+which can be useful to prevent power hungry services like anacron to run
+when a laptop is only running on battery, for instance.
+
+Since keventd is not an integral part of Finit yet it is not enabled by
+default.  Enable it using `./configuure --with-keventd`.  The bundled
+contrib build scripts for Debian, Alpine, and Void have this enabled.
+
+This daemon is planned to be extended with monitoring of other uevents,
+patches and ideas are welcome in the issue tracker.

doc/plugins.md

@@ -35,25 +35,27 @@ For your convenience a set of *optional* plugins are available:
   _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.
 
 * *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._
 

doc/service.md

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

man/.gitignore

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

man/Makefile.am

@@ -0,0 +1,2 @@
+dist_man8_MANS = finit.8 initctl.8
+dist_man5_MANS = finit.conf.5

man/finit.8

@@ -0,0 +1,179 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.Dd June 6, 2021
+.\" Please adjust this date whenever revising the manpage.
+.Dt FINIT 8 SMM
+.Os Linux
+.Sh NAME
+.Nm finit
+.Nd Fast init for Linux systems
+.Sh SYNOPSIS
+.Nm /sbin/finit
+.Op --
+.Op finit.status=[on,off]
+.Op finit.status_style=[classic,modern]
+.Op finit.debug
+.Op rescue | recover
+.Op single | S
+.Nm /sbin/telinit
+.Op Fl hv
+.Op q | Q | 0-9
+.Sh DESCRIPTION
+Fast init for Linux systems.  Reverse engineered from the EeePC
+fastinit, 10+ years ago by Claudio Matsuoka, "gaps filled with frog
+DNA ...".  Focus is on small and embedded systems, although Finit is
+fully usable on server and desktop systems as well.
+.Pp
+Features include:
+.Bl -bullet -width 1n -compact
+.It
+Runlevels, defined per service
+.It
+One-shot tasks, services (daemons), or SysV init start/stop scripts
+.It
+Runparts and
+.Pa /etc/rc.local
+support
+.It
+Process supervision similar to
+.Xr systemd 8
+.It
+Sourcing environment files
+.It
+Conditions for network/process/custom dependencies
+.It
+Pre/Post script actions
+.It
+Tooling to enable/disable services
+.It
+Built-in getty
+.It
+Built-in watchdog, with support for hand-over to
+.Lk https://troglobit.com/watchdogd.html watchdogd
+.It
+Built-in support for Debian/BusyBox
+.Pa /etc/network/interfaces
+.It
+Cgroups v2, both configuration and monitoring in `initctl top`
+.It
+Plugin support for customization
+.It
+Proper rescue mode with bundled `sulogin` for protected maintenance shell
+.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 ,
+ensuring that necessary filesystems like:
+.Pa /dev ,
+.Pa /proc ,
+.Pa /sys ,
+and
+.Pa /run
+are available and can provide the system with the services required.
+.Pp
+With that out of the way, a set of plugins take over:
+.Pp
+.Bl -tag -width bootmisc.so -offset indent
+.It Cm bootmisc.so
+Cleans up stale files from previous boots and default directories are
+created in tmpfs filesystems
+.It Cm modprobe.so
+Probes kernel modules required by the system
+.It Cm procps.so
+Set kernel variables from
+.Pa /etc/sysctl.conf
+et al
+.El
+.Pp
+When the plugins are done, finit reads
+.Pa /etc/finit.conf
+and all other enabled services in
+.Pa /etc/finit.d/* .
+First all services, run/tasks in runlevel S (bootStrap) are started,
+When all run/tasks have completed, Finit changes to the configured
+runlevel (default 2), Processes are started in parallel, in dependency
+order according to their conditions.
+.Pp
+When all services and run/tasks have been started, the console progress
+is disabled and all configured getty services are started.
+.Sh CONDITIONS
+The condition subysystem in Finit was initially created to track PID
+files of daemons.  If service/task B requires service A to have started,
+Finit waits for the PID file of service A to be created/updated before
+it starts service B.  Conversely, if service A is stopped and its PID
+file removed, service B is also stopped.
+.Pp
+The following condition families are available today:
+.Pp
+.Bl -tag -width pid -offset indent
+.It Cm net
+Linux netlink events, e.g. net/route/default, net/eth0/up, and
+net/et0/running
+.It Cm pid
+PID files basd on the service declaration
+.Cm name:id ,
+gives the condition pid/name:id
+.It Cm sys
+System conditions, e.g. sys/key/ctrlaltdel and sys/pwr/fail
+.It Cm usr
+User conditions, assert and deassert using
+.Cm initctl cond [set|clr] foo
+.El
+.Sh SIGNALS
+PID 1 is the only process that by default blocks all signals.  Finit
+allows for the following signals to control operation, but recommends
+instead using the
+.Xr initctl 8
+tool.
+.Pp
+.Bl -tag -width TERM
+.It HUP
+Tell
+.Nm
+to reload its configuration file(s), same as
+.Cm initctl reload
+.It USR1
+Restart API
+.Cm ( initctl )
+socket.
+.It USR2
+Tell
+.Nm
+to perform a system shutdown, same as
+.Cm initctl poweroff
+.It TERM
+Like SIGUSR2 but performs a reboot, same as
+.Cm initctl reboot
+.It INT
+Sent from kernel when Ctrl-Alt-Del is pressed (on the console), this
+asserts the sys/key/ctrlaltdel condition, which can be used to start
+tasks or services
+.It PWR
+Sent from a a power daemon on changes to UPS status, Finit asserts
+the sys/pwr/fail condition
+.El
+.Sh FILES
+.Bl -tag -width /etc/finit.d/available/*.conf -compact
+.It Pa /etc/finit.conf
+Main configuration file
+.It Pa /etc/finit.d/*.conf
+Static service definitions
+.It Pa /etc/finit.d/available/*.conf
+Available services
+.It Pa /etc/finit.d/enabled/*.conf
+Symlinks from available
+.It Pa /run/finit/
+Runtime files, including the condition subsystem
+.El
+.Sh SEE ALSO
+.Xr finit.conf 5
+.Xr initctl 8
+.Sh AUTHORS
+.Nm
+was conceived and reverse engineered by Claudio Matsuoka.  Since v1.0,
+maintained by Joachim Wiberg, with contributions by many others.

man/finit.conf.5

@@ -0,0 +1,861 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.Dd Oct 17, 2020
+.Dt FINIT.CONF 5 SMM
+.Os Linux
+.Sh NAME
+.Nm finit.conf
+.Nd Finit configuration file format
+.Sh SYNOPSIS
+.Nm /etc/finit.conf
+.Nm /etc/finit.d/*.conf
+.Nm /etc/finit.d/available/*.conf
+.Sh DESCRIPTION
+.Nm finit
+can be configured using only the original
+.Pa /etc/finit.conf
+file or in combination with
+.Pa /etc/finit.d/*.conf .
+Useful for package-based Linux distributions \(em each package can
+provide its own "script" file.
+.Pp
+.Bl -tag -width /etc/finit.d/*.conf -offset indent -compact
+.It Pa /etc/finit.conf
+Main configuration file
+.It Pa /etc/finit.d/*.conf
+Snippets, usually one service per file
+.El
+.Pp
+Not all configuration directives are available in
+.Pa /etc/finit.d/*.conf
+and some directives are only available at bootstrap, runlevel
+.Cm S ,
+see the section
+.Sx Limitations
+below for details.
+.Sh FILES
+.Bl -tag -width /etc/finit.d/available/*.conf -compact
+.It Pa /etc/finit.conf
+Main configuration file
+.It Pa /etc/finit.d/*.conf
+Static service definitions
+.It Pa /etc/finit.d/available/*.conf
+Available services
+.It Pa /etc/finit.d/enabled/*.conf
+Enabled services, symlinks from available
+.El
+.Sh FILE FORMAT
+Lines starting with `#' are ignored. Note that end-of-line comments are
+NOT supported, comments must be on a line of their own.
+.Pp
+A configuration stanza must be on a single (long) line and
+.Em cannot
+be broken up in multiple lines by use of a backslash as the last
+character.
+.Sh DIRECTIVES
+This section lists all supported configuration directives.  There also exist
+deprecated directives, see the Markdown documentation for details on these.
+.Pp
+.Bl -tag -width 1n
+.It Cm rlimit Oo hard|soft Oc Ar RESOURCE Aq LIMIT | unlimited
+.Pp
+Set the hard or soft limit for a resource, or both if that argument is
+omitted.
+.Ar RESOURCE
+is the lower-case
+.Cm RLIMIT_
+string constants from
+.Xr setrlimit 2 ,
+without prefix.  E.g. to set
+.Cm RLIMIT_CPU ,
+use
+.Cm cpu .
+.Pp
+.Ar LIMIT
+is an integer that depends on the resource being modified, see
+the man page, or the kernel
+.Pa /proc/PID/limits
+file, for details.
+Finit versions before v3.1 used
+.Cm infinity
+for
+.Cm unlimited ,
+which is still supported, albeit deprecated.
+.Bd -unfilled -offset indent
+# No process is allowed more than 8MB of address space
+rlimit hard as 8388608
+
+# Core dumps may be arbitrarily large
+rlimit soft core infinity
+
+# CPU limit for all services, soft & hard = 10 sec
+rlimit cpu 10
+.Ed
+.Pp
+.Cm rlimit
+can be set globally, in
+.Pa /etc/finit.conf ,
+or locally per each
+.Pa /etc/finit.d/*.conf
+read.  I.e., a set of task/run/service stanzas can share the same
+rlimits if they are in the same .conf.
+.It Cm runlevel Aq N
+The system runlevel to go to after bootstrap (S) has completed.
+.Cm N
+is the runlevel number 0-9, where 6 is reserved for reboot and 0 for
+halt.  All other can be used by operating system administrators.
+Default: 2
+.Pp
+.Sy Note:
+only read and executed in runlevel S (bootstrap).
+.It Cm run Oo LVLS Oc Ao COND Ac Ar /path/to/cmd ARGS Op -- Optional description
+One-shot command to run in sequence when entering a runlevel, with
+optional arguments and description.
+.Pp  
+.Cm run
+commands are guaranteed to be completed before running the next
+command.  Highly useful if true serialization is needed.  Usually
+only used in the bootstrap (S) runlevel.
+.Pp
+.Cm Aq COND
+conditions are described in
+.Xr finit 8 ,
+see also the
+.Sx Examples
+section below.
+.It Cm task Oo LVLS Oc Ao COND Ac Ar /path/to/cmd ARGS Op -- Optional description
+One-shot like
+.Cm run ,
+but starts in parallel with the next command.
+.Pp  
+Both
+.Cm run
+and
+.Cm task
+commands are run in a shell, so pipes and redirects can be freely used:
+.Bd -unfilled -offset indent
+task [s] echo "foo" | cat >/tmp/bar
+.Ed
+.It Cm sysv Oo LVLS Oc Ao COND Ac Ar /path/to/script ARGS Op -- Optional description
+Similar to
+.Cm task
+is the
+.Cm sysv
+stanza, which can be used to call SysV style start/stop scripts.  The
+primary intention for this command is to be able to re-use much of
+existing setup and init scripts in Linux distributions.
+.Pp  
+When entering an allowed runlevel, Finit calls
+.Cm init-script start ,
+when entering a disallowed runlevel, Finit calls
+.Cm init-script stop ,
+and if the Finit .conf, where the
+.Cm sysv
+stanza is declared, is modified, Finit calls
+.Cm init-script restart
+on
+.Cm initctl reload .
+Similar to how
+.Cm service
+stanzas work.
+.Pp
+Forking services started with
+.Cm sysv
+scripts can be monitored by Finit by declaring the PID file to look for:
+.Bd -unfilled -offset indent
+sysv pid:!/path/to/pidfile.pid /path/to/script ...
+.Ed
+.Pp
+The leading '!' is to prevent Finit from managing the PID file, which is
+the default behavior for the
+.Cm pid:
+command modifier.
+.It Cm service Oo LVLS Oc Ao COND Ac Ar /path/to/daemon ARGS Op -- Optional description
+Service, or daemon, to be monitored and automatically restarted if it
+exits prematurely.  Finit tries to restart services that die, by
+default 10 times, before giving up and marking them as
+.Em crashed .
+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  
+For daemons that support it, we recommend appending
+.Cm --foreground , --no-background , -n , -F ,
+or similar command line argument to prevent them from forking off a
+sub-process in the background.  This is the most reliable way to monitor
+a service.
+.Pp
+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
+.Cm sysv
+services, using the
+.Cm pid:!/path/to/pidfile.pid
+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
+(below), we omit the
+.Cm -d
+flag (daemonize) to prevent it from forking to the background:
+.Bd -unfilled -offset indent
+service [2345] <pid/zebra> /sbin/ospfd -- OSPF daemon
+.Ed
+.Pp
+.Cm [2345]
+denote the runlevels
+.Cm ospfd
+is allowed to run in, they are optional and default to runlevel 2-5 if
+omitted.
+.Pp
+.Cm <pid/zebra>
+is the condition for starting
+.Cm ospfd .
+In this example Finit waits for another service,
+.Cm zebra ,
+to have created its PID file in
+.Pa /var/run/quagga/zebra.pid
+before starting
+.Cm ospfd .
+Finit watches *all* files in
+.Pa /var/run ,
+for each file named
+.Cm *.pid ,
+.Cm */pid ,
+Finit opens it and find the matching
+.Cm NAME:ID
+using the PID.
+.Pp
+Some services do not maintain a PID file and rather than patching each
+application Finit provides a workaround.  A
+.Cm pid
+modifier keyword can be set to have Finit automatically create (when
+starting) and later remove (when stopping) the PID file.  The file is
+created in the
+.Pa /var/run
+directory using the
+.Xr basename 3
+of the service.  The full syntax of the
+.Cm pid
+modifier is:
+.Bd -unfilled -offset indent
+pid[:[!][/path/to/]filename[.pid]]
+.Ed
+.Pp
+For example, by adding
+.Cm pid:/run/foo.pid
+to the service
+.Cm /sbin/bar ,
+that PID file will, not only be created and removed automatically, but
+also be used by the Finit condition subsystem.  So a service/run/task
+can depend on the
+.Cm <pid/bar>
+condition.
+.Pp
+If a service should not be automatically started, it can be configured
+as manual with the
+.Cm manual:yes
+command modifier.  The service can then be started at any time by
+running
+.Cm initctl start NAME
+.Pp
+The name of a service, shown by the
+.Cm initctl
+tool, defaults to the basename of the service executable. It can be
+changed with the
+.Cm name:foo
+command modifier.
+.Pp
+As mentioned previously, services are automatically restarted should
+they crash, this is configurable with the following options:
+.Bl -tag -width 1n
+.It Cm restart:NUM
+number of times Finit tries to restart a crashing
+service, default: 10.  When this limit is reached the service is
+marked
+.Em crashed
+and must be restarted manually with
+.Xr initctl 8 .
+.It Cm 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
+.It Cm norestart
+dont restart on failures, same as
+.Cm restart:0
+.It Cm oncrash:reboot
+when all retries have failed, and the service
+has
+.Em crashed ,
+if this option is set the system is rebooted.  Note, future releases
+may include other
+.Cm oncrash:
+actions.
+.El
+.Pp
+When stopping a service (run/task/sysv/service), either manually or when
+moving to another runlevel, Finit starts by sending SIGTERM, to allow
+the process to shut down gracefully.  If the process has not been
+collected within 3 seconds, Finit sends SIGKILL.  To halt the process
+using a different signal, use the command modifier
+.Cm halt:SIGNAL ,
+e.g.,
+.Cm halt:SIGPWR .
+To change the delay between your halt signal and KILL, use the command
+modifier
+.Cm kill:SEC ,
+e.g.,
+.Cm kill:10
+to wait 10 seconds before sending SIGKILL.
+.Pp
+Services support the
+.Cm pre:script
+and
+.Cm post:script
+command actions as well.  These run as the same
+.Cm @USER:GROUP
+as the service itself, with any
+.Cm env:file
+sourced.  The scripts must use an absolute path, but are executed from
+the
+.Cm $HOME
+of the given user.  The scripts are not called with any argument
+(currently), but both get the
+.Cm SERVICE_IDENT=foo
+environment variable set.  Here
+.Cm foo
+denotes the identity of the service, which if there are multiple
+services named
+.Cm foo ,
+may be
+.Cm foo:1 ,
+or any unique identifier specified in the .conf file.  The
+.Cm post:script
+is called with an additional set of environment variables:
+.Bl -tag -offset indent -width 1n
+.It Cm EXIT_CODE=[exited,signal]
+set to one of
+.Cm exited
+or
+.Cm signal
+.It Cm EXIT_STATUS=[num,SIGNAME]
+set to one of exit status code from the program, if it exited normally,
+or the signal name (HUP, TERM, etc.) if it exited due to signal
+.El
+.Pp
+The scripts have a default execution time of 3 seconds before they are
+SIGKILLed, this can be adjusted using the
+.Cm kill:SEC
+modifier syntax.
+.Pp
+.Sy Note:
+the
+.Cm pre:script
+.Em must
+be idempotent, because a service can transition between READY and HALTED
+states any number of times before going to RUNNING.
+.It Cm runparts Aq DIR
+Call
+.Xr run-parts 8
+on
+.Cm DIR
+to run start scripts.  All executable files, or scripts, in the
+directory are called, in alphabetic order.  The scripts in this
+directory are executed at the very end of bootstrap, runlevel S.
+.Pp
+It can be beneficial to use
+.Cm S01name ,
+.Cm S02othername ,
+etc. if there is a dependency order between the scripts.  Symlinks to
+existing daemons can talso be used, but make sure they daemonize by
+default.
+.Pp
+Similar to the
+.Pa /etc/rc.local
+shell script, make sure that all your services and programs either
+terminate or start in the background or you will block Finit.
+.Sy Note:
+only read and executed in runlevel S (bootstrap).
+.It Cm include Aq CONF
+Include another configuration file.  Absolute path required.
+.It Cm log size:BYTES count:NUM
+Log rotation for run/task/services using the
+.Cm log
+command modifier with redirection to a log file.  Global setting,
+applies to all services.
+.Pp
+The size can be given as bytes, without a specifier, or in `k`, `M`,
+or `G`, e.g.
+.Cm size:10M ,
+or
+.Cm size:3G .
+A value of
+.Cm size:0
+disables log rotation.  The default is
+.Cm size:200k .
+.Pp
+The count value is recommended to be between 1-5, with a default 5.
+Setting count to 0 means the logfile will be truncated when the MAX
+size limit is reached.
+.It Cm tty Oo LVLS Oc Ao COND Ac Ar DEV Oo BAUD Oc Oo noclear Oc Oo nowait Oc Oo nologin Oc Oo TERM Oc
+This form of the
+.Cm tty
+stanza uses the built-in getty on the given TTY device
+.Ar DEV ,
+in the given runlevels.
+.Ar DEV may be the special keyword
+.Cm @console ,
+or `console`, which is expanded from `/sys/class/tty/console/active`,
+useful on embedded systems.
+.Pp
+The default baud rate is 0, i.e., keep kernel default.
+.Pp
+The `tty` stanza inherits runlevel, condition (and other feature)
+parsing from the `service` stanza.  So TTYs can run in one or many
+runlevels and depend on any condition supported by Finit.  This is
+useful e.g. to depend on `<pid/elogind>` before starting a TTY.
+.Bd -unfilled -offset indent
+tty [12345] /dev/ttyAMA0 115200 noclear vt220
+.Ed
+.It Cm tty Oo LVLS Oc Ao COND Ac Ar CMD DEV Oo noclear Oc Oo nowait Oc
+This form of the
+.Cm tty
+stanza is for using an external getty, like agetty or the BusyBox getty.
+.Pp
+By default, these first two syntax variants
+.Em clear
+the TTY and
+.Em wait
+for the user to press enter before starting getty.
+.Bd -unfilled -offset indent
+tty [12345] /sbin/getty  -L 115200 /dev/ttyAMA0 vt100
+tty [12345] /sbin/agetty -L ttyAMA0 115200 vt100 nowait
+.Ed
+.Pp
+The
+.Cm noclear
+option disables clearing the TTY after each session.  Clearing the TTY
+when a user logs out is usually preferable.
+.Pp  
+The
+.Cm nowait
+option disables the
+.Cm Please press Enter to activate console
+message before actually starting the getty program.  On small and
+embedded systems running multiple unused getty wastes both memory and
+CPU cycles, so `wait` is the preferred default.
+.Pp
+The
+.Cm nologin
+option disables getty and
+.Pa /bin/login ,
+and gives the user a root (login) shell on the given TTY
+.Cm DEV
+immediately.  Needless to say, this is a rather insecure option, but can
+be very useful for developer builds, during board bringup, or similar.
+.Pp
+Notice the ordering, the
+.Cm TERM
+option to the built-in getty must be the last argument.
+.Pp
+Embedded systems may want to enable automatic `DEV` by supplying the
+special
+.Cm @console
+device.  This works regardless weather the system uses
+.Cm ttyS0 , ttyAMA0 ,  ttyMXC0 ,
+or anything else.  Finit figures it out by querying sysfs:
+.Pa /sys/class/tty/console/active .
+The speed can be omitted to keep the kernel default.
+.Pp
+Most systems get by fine by just using `console`, which will evaluate
+to
+.Pa /dev/console .
+If you have to use
+.Cm @console
+to get any output, you may have some issue with your kernel config.
+.Bd -unfilled -offset indent
+tty [12345] @console noclear vt220
+.Ed
+.Pp
+On really bare bones systems, or for board bringup, Finit can give you a
+shell prompt as soon as bootstrap is done, without opening any device
+node:
+.Bd -unfilled -offset indent
+tty [12345789] notty
+.Ed
+.Pp
+This should of course not be enabled on production systems.  Because it
+may give a user root access without having to log in.  However, for
+board bringup and system debugging it can come in handy.
+.Pp
+One can also use the
+.Cm service
+stanza to start a stand-alone shell:
+.Bd -unfilled -offset indent
+service [12345] /bin/sh -l
+.Ed
+.Pp
+.It Cm tty Oo LVLS Oc Ao COND Ac Oo notty Oc Oo rescue Oc
+The third
+.Cm tty
+form is for board bringup and the
+.Cm rescue
+boot mode.  No device node is required in this variant, the same output
+that the kernel uses is reused for stdio.  If the
+.Cm rescue
+option is omitted, a shell is started.  The flags
+.Cm nologin , noclear ,
+and
+.Cm nowait
+are implied.   If the
+.Cm rescue
+option is set the bundled
+.Pa /libexec/finit/sulogin
+is started to present a bare-bones root login prompt.  If the root
+(uid:0, gid:0) user does not have a password set, no rescue is possible.
+.El
+.Sh COMMAND MODIFIERS
+The run/task/tty/service/sysv stanzas take modifiers, or options, to
+control their behavior.  This section lists them with their limitations.
+All modifiers must be placed between the stanza and its command.
+.Bl -tag -width 1n
+.It Cm @user:group
+Every
+.Cm run , task ,
+or
+.Cm service
+can also list the privileges the
+.Cm /path/to/cmd
+should be executed with.  Prefix the command with
+.Cm @USR[:GRP] ,
+group is optional, like this:
+.Bd -unfilled -offset indent
+run [2345] @joe:users logger "Hello world"
+.Ed
+.Pp
+For multiple instances of the same command, e.g. a DHCP client or
+multiple web servers, add
+.Cm :ID
+somewhere between the
+.Cm run , task , service
+keyword and the command, like this:
+.Bd -unfilled -offset indent
+service :80  [2345] httpd -f -h /http -p 80   -- Web server
+service :8080[2345] httpd -f -h /http -p 8080 -- Old web server
+.Ed
+.Pp
+Without the
+.Cm :ID
+to the service the latter will overwrite the former and only the old web
+server would be started and supervised.
+.It Cm log:/path/to/file
+Redirect stdout/stderr of a command to the given log file.  See the
+global log directive, above, for details on log rotation.
+.It Cm log:console
+Redirect stdout/stderr of a command to
+.Pa /dev/console ,
+only use this for debugging or bringup.
+.It Cm log:null
+Redirect stdout/stderr of a command to
+.Pa /dev/null .
+.It Cm log:prio:facility.level,tag:ident
+Redirect stdout/stderr of a command to syslog using the given priority
+and tag identity.
+.Bd -unfilled -offset indent
+service log:prio:user.warn,tag:ntpd /sbin/ntpd pool.ntp.org -- NTP daemon
+.Ed
+.It Cm log
+Default
+.Cm prio
+is
+.Cm daemon.info
+and the default
+.Cm tag
+identity is the basename of the service or run/task command.
+.El
+.Sh RESCUE MODE
+Finit supports a rescue mode which is activated by the
+.Cm rescue
+option on the kernel command line.  The rescue mode comes in two
+flavors:
+.Em traditional
+and
+.Em fallback .
+.Ss Traditional
+This is what most users expect.  A very early maintenance login prompt,
+served by the bundled
+.Pa /libexec/finit/sulogin
+program, or the standard
+.Cm sulogin
+from util-linux or BusyBox is searched for in the UNIX default
+.Cm $PATH .
+If a successful login is made, or the user exits (Ctrl-D), the rescue
+mode is ended and the system boots up normally.
+.Pp
+.Sy Note:
+if the user (UID 0 and GID 0) does not have a password, or
+.Em the account is locked ,
+the user is presented with a password-less prompt:
+.Cm "Press enter to enter maintenance mode." ,
+which opens up a root shell.
+.Ss Fallback
+If no
+.Cm sulogin
+program is found, Finit tries to bring up as much of its own
+functionality as possible, yet limiting many aspects, meaning; no
+network, no`fsck` of file systems in
+.Pa /etc/fstab ,
+no
+.Pa /etc/rc.local ,
+no
+.Cm runparts ,
+and most plugins are skipped (except those that provide functionality
+for the condition subsystem).
+.Pp
+Instead of reading
+.Pa /etc/finit.conf
+et al, system configuration is read from
+.Pa /lib/finit/rescue.conf ,
+which can be freely modified by the system administrator.
+.Pp
+The bundled default `rescue.conf` contains nothing more than:
+.Bd -unfilled -offset indent
+runlevel 1
+tty [12345] rescue
+.Ed
+.Pp
+The
+.Cm tty
+has the
+.Cm rescue
+option set, which works similar to the board bring-up tty option
+.Cm notty .
+The major difference being that `sulogin` is started to query for
+root/admin password.  If
+.Cm sulogin
+is not found,
+.Cm rescue
+behaves like
+.Cm notty
+and gives a plain root shell prompt.
+.Pp
+If Finit cannot find
+.Pa /lib/finit/rescue.conf
+it defaults to:
+.Bd -unfilled -offset indent
+tty [12345] rescue
+.Ed
+.Pp
+There is no way to exit the
+.Em fallback
+rescue mode.
+.Sh SERVICE ENVIRONMENT
+Finit supports sourcing environment variables from
+.Pa /etc/default/* ,
+or similar.  This is a common pattern from SysV init scripts, where the
+start/stop script is a generic script for the given service,
+.Cm foo ,
+and the options for the service are sourced from the file
+.Pa /etc/default/foo .
+Like this:
+.Bd -unfilled -offset indent
+/etc/default/foo:
+
+    FOO_OPTIONS=--extra-arg="bar" -s -x
+
+/etc/finit.conf:
+
+    service [2345] env:-/etc/default/foo foo -n $FOO_OPTIONS -- Example foo daemon
+.Ed
+.Pp
+Here the service
+.Cm foo
+is started with
+.Op Fl -n ,
+to make sure it runs in the foreground, and the with the options found
+in the environment file.  With the
+.Cm ps
+command we can see that the process is started with:
+.Bd -unfilled -offset indent
+foo -n --extra-arg=bar -s -x
+.Ed
+.Pp
+.Sy Note:
+the leading `-` determines if Finit should treat a missing environment
+file as blocking the start of the service or not.  When `-` is used, a
+missing environment file does
+.Em not
+block the start.
+.Sh SERVICE WRAPPER SCRIPTS
+If your service requires to run additional commands, executed before the
+service is actually started, like the systemd `ExecStartPre`, you can
+use a wrapper shell script to start your service.
+.Pp
+The Finit service
+.Cm .conf
+file can be put into
+.Pa /etc/finit.d/available ,
+so you can control the service using
+.Cm initctl .
+Then use the path to the wrapper script in the Finit
+.Cm .conf
+service stanza.  The following example employs a wrapper script in
+.Pa /etc/start.d .
+.Bd -unfilled
+/etc/finit.d/available/program.conf:
+
+    service [235] <!> /etc/start.d/program -- Example Program
+
+/etc/start.d/program:
+
+    #!/bin/sh
+    # Prepare the command line options
+    OPTIONS="-u $(cat /etc/username)"
+
+    # Execute the program
+    exec /usr/bin/program $OPTIONS
+.Ed
+.Pp
+.Sy Note:
+the example sets
+.Cm <!>
+to denote that it doesn't support SIGHUP.  That way Finit will
+stop/start the service instead of sending SIGHUP at restart/reload
+events.
+.Sh CGROUPS
+There are three major cgroup configuration directives:
+.Pp
+.Bl -enum -offset indent -compact
+.It
+Global top-level group: init, system, user, or a custom group
+.It
+Selecting a top-level group for a set of run/task/services
+.It
+Per run/task/service limits
+.El
+.Pp
+Top-level group configuration.
+.Bd -unfilled -offset indent
+# Top-level cgroups and their default settings.  All groups mandatory
+# but more can be added, max 8 groups in total currently.  The cgroup
+# 'root' is also available, reserved for RT processes.  Settings are
+# as-is, only one shorthand 'mem.' exists, other than that it's the
+# cgroup v2 controller default names.
+cgroup init   cpu.weight:100
+cgroup user   cpu.weight:100
+cgroup system cpu.weight:9800
+.Ed
+.Pp
+Adding an extra cgroup
+.Cm maint/
+will require you to adjust the weight of the above three.  We leave
+.Cm init/
+and
+.Cm user/
+as-is reducing weight of
+.Cm system/
+to 9700.
+.Bd -unfilled -offset indent
+cgroup system cpu.weight:9700
+
+# Example extra cgroup 'maint'
+cgroup maint  cpu.weight:100
+.Ed
+.Pp
+By default, the
+.Cm system/
+cgroup is selected for almost everything.  The
+.Cm init/
+cgroup is reserved for PID 1 itself and its closest relatives.  The
+.Cm user/
+cgroup is for local TTY logins spawned by getty.
+.Pp
+To select a different top-level cgroup, e.g.
+.Cm maint/ ,
+one can either define it for a group of run/task/service directives in a
+.Cm .conf
+or per each stanza:
+.Bd -unfilled -offset indent
+cgroup.maint
+service [...] <...> /path/to/foo args -- description
+service [...] <...> /path/to/bar args -- description
+.Ed
+.Pp
+or
+.Bd -unfilled -offset indent
+service [...] <...> cgroup.maint /path/to/foo args -- description
+.Ed
+.Pp
+The latter form also allows per-stanza limits on the form:
+.Bd -unfilled -offset indent
+service [...] <...> cgroup.maint:cpu.max:10000,mem.max:655360 /path/to/foo args -- description
+.Ed
+.Pp
+Notice the comma separation and the
+.Cm mem.
+exception to the rule: every cgroup setting maps directly to cgroup v2
+syntax.  I.e.,
+.Cm cpu.max
+maps to the file
+.Pm /sys/fs/cgroup/maint/foo/cpu.max .
+There is no filtering, except for expanding the shorthand
+.Cm mem.
+to
+.Cm memory. ,
+if the file is not available, either the cgroup controller is not
+available in your Linux kernel, or the name is misspelled.
+.Pp
+Linux cgroups and details surrounding values are not explained in the
+Finit documentation.  The Linux admin-guide cover this well:
+.Lk https://www.kernel.org/doc/html/latest/admin-guide/cgroup-v2.html
+.Sh LIMITATIONS
+As of Finit v4 there are no limitations to where
+.Cm .conf
+settings can be placed.  Except for the system/global
+.Cm rlimit
+and
+.Cm cgroup
+top-level group declarations, which can only be set from
+.Pa /etc/finit.conf ,
+since it is the first
+.Cm .conf
+file Finit reads.
+.Pp
+Originally,
+.Pp /etc/finit.conf
+was the only way to set up a Finit system.  Today it is mainly used for
+bootstrap settings like system hostname, early module loading for
+watchdogd, network bringup and system shutdown.  These can now also be
+set in any
+.Cm .conf
+file in
+.Pa /etc/finit.d .
+.Pp
+There is, however, nothing preventing you from having all configuration
+settings in
+.Pa /etc/finit.conf .
+.Sh SEE ALSO
+.Xr finit 8 ,
+.Xr initctl 8
+.Sh AUTHORS
+.Nm finit
+was conceived and reverse engineered by Claudio Matsuoka.  Since v1.0,
+maintained by Joachim Wiberg, with contributions by many others.

man/initctl.8

@@ -0,0 +1,194 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.Dd June 6, 2021
+.\" Please adjust this date whenever revising the manpage.
+.Dt INITCTL 8 SMM
+.Os Linux
+.Sh NAME
+.Nm initctl
+.Nd Control tool for Finit
+.Sh SYNOPSIS
+.Nm /sbin/initctl
+.Op Fl bcfhlpqtvV
+.Op COMMAND
+.Sh DESCRIPTION
+.Nm
+is the official tool for interacting with
+.Xr finit 8 .
+It comes with functions for showing status, querying health of services,
+as well as editing, enabling and disabling services.
+.Sh OPTIONS
+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.
+.It Fl c, -create
+Create missing paths (and files) as needed.  Useful with the edit command.
+.It Fl f, -force
+Ignore missing files and arguments, never prompt.
+.It Fl h, -help
+Show built-in help text.
+.It Fl 1, -once
+Only one lap in commands like top.
+.It Fl p, -plain
+Use plain table headings, no ANSI control characters.
+.It Fl q, -quiet
+Silent, only return status of command.
+.It Fl t, -no-heading
+Skip table headings.
+.It Fl v, -verbose
+Verbose output, where applicable.
+.It Fl V, -version
+Show program version.
+.El
+.Sh COMMANDS
+.Bl -tag -width Ds
+.It Nm Ar debug
+Toggle
+.Nm finit
+(daemon) debug to
+.Pa /dev/console
+.It Nm Ar help
+Show built-in help text
+.It Nm Ar version
+Show program version
+.It Nm Ar ls | list
+List all
+.Cm *.conf
+files in
+.Pa /etc/finit.d
+.It Nm Ar create Ar CONF
+Create
+.Cm .conf
+in
+.Pa /etc/finit.d/available
+.It Nm Ar delete Ar CONF
+Delete
+.Cm .conf
+in
+.Pa /etc/finit.d/available
+.It Nm Ar show Ar CONF
+Show
+.Cm .conf
+in
+.Pa /etc/finit.d/available
+.It Nm Ar edit Ar CONF
+Edit
+.Cm .conf
+in
+.Pa /etc/finit.d/available
+.It Nm Ar touch Ar CONF
+Change (mark as modified)
+.Cm .conf
+in
+.Pa /etc/finit.d/available ,
+like
+.Ar edit
+this tells
+.Nm finit
+that a configuration has been changed and is a candidate to be restarted
+(or SIGHUP'ed) on
+.Cm initctl reload
+.It Nm Ar enable Ar CONF
+Enable
+.Cm .conf
+in
+.Pa /etc/finit.d/available ,
+i.e., add symlink in
+.Pa /etc/finit.d/enabled
+.It Nm Ar disable Ar CONF
+Disable
+.Cm .conf
+in
+.Pa /etc/finit.d/enabled ,
+i.e., removes symlink
+.It Nm Ar reload
+Reload
+.Cm *.conf in
+.Pa /etc/finit.d ,
+i.e., activates changes
+.It Nm Ar cond set Ar COND
+Set (assert) user-defined condition,
+.Cm +usr/COND
+.It Nm Ar cond clr | clear Ar COND
+Clear (deassert) user-defined condition,
+.Cm -usr/COND
+.It Nm Ar cond status
+Show condition status, default
+.Cm cond
+command.
+.It Nm Ar cond dump
+Dump all conditions and their status
+.It Nm Ar ident Op Cm NAME
+Display indentities of all run/task/services, or only instances
+matching
+.Cm NAME .
+A partial string, e.g.,
+.Cm NAM ,
+will not match anything
+.It Nm Ar log Op Cm NAME
+Show ten last Finit, or
+.Cm NAME ,
+messages from syslog
+.It Nm Ar start Cm NAME[:ID]
+Start service by name, with optional ID, e.g.,
+.Cm initctl start tty:1
+.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)
+.It Nm Ar signal Cm NAME:[ID] S
+Send signal S to service, by name.
+.Cm S
+may be a complete signal name such as SIGHUP, or short name such as HUP, or the signal number such as 1 (SIGHUP).
+.It Nm Ar restart Cm NAME[:ID]
+Restart (stop/start) service by name
+.It Nm Ar status Cm NAME[:ID]
+Show service status, by name.  If only
+.Cm NAME
+is given and multiple instances exits, a summary of all matching
+instances are shown.  Only an exact match displays the detailed status
+for a particular instance
+.It Nm Ar status
+Show status of all services, default command
+.It Nm Ar cgroup
+List cgroup config overview
+.It Nm Ar ps
+List processes based on cgroups
+.It Nm Ar top
+Show top-like listing based on cgroups
+.It Nm Ar runlevel Op Ar 0-9
+Show or set runlevel: 0 halt, 6 reboot
+.It Nm Ar reboot
+Reboot system, default if
+.Cm reboot
+is symlinked to
+.Nm
+.It Nm Ar halt
+Halt system, default if
+.Cm halt
+is symlinked to
+.Nm
+.It Nm Ar poweroff
+Power-off system, default if
+.Cm poweroff
+is symlinked to
+.Nm
+.It Nm Ar suspend
+Suspend system, default if
+.Cm suspend
+is symlinked to
+.Nm
+.It Nm Ar utmp show
+Raw dump of UTMP/WTMP db
+.El
+.Sh SEE ALSO
+.Xr finit.conf 5
+.Xr finit 8
+.Sh AUTHORS
+.Nm finit
+was conceived and reverse engineered by Claudio Matsuoka.  Since v1.0,
+maintained by Joachim Wiberg, with contributions by many others.

plugins/Makefile.am

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

plugins/alsa-utils.c

@@ -21,7 +21,12 @@
  * THE SOFTWARE.
  */
 
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
+
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"

plugins/bootmisc.c

@@ -24,7 +24,11 @@
 #include <ftw.h>
 #include <mntent.h>
 #include <string.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "config.h"
 #include "finit.h"
@@ -100,6 +104,12 @@ static void clean(void *arg)
 	}
 }
 
+static void ln(const char *target, const char *linkpath)
+{
+	if (symlink(target, linkpath) && errno != EEXIST)
+		_pe("Failed creating %s -> %s symlink", target, linkpath);
+}
+
 /*
  * Setup standard FHS 2.3 structure in /var, and write runlevel to UTMP
  */
@@ -121,11 +131,11 @@ static void setup(void *arg)
 		_d("System with new /run tmpfs ...");
 		if (!fisdir("/run/lock"))
 			makedir("/run/lock", 1777);
-		symlink("/run/lock", "/var/lock");
-		symlink("/dev/shm", "/run/shm");
+		ln("/run/lock", "/var/lock");
+		ln("/dev/shm", "/run/shm");
 
 		/* compat only, should really be set up by OS/dist */
-		symlink("/run", "/var/run");
+		ln("/run", "/var/run");
 	} else {
 		makedir("/var/lock", 1777);
 		makedir("/var/run", 0755);
@@ -179,7 +189,7 @@ static void setup(void *arg)
 	makedir("/var/run/sshd",  01755); /* OpenSSH  */
 
 	if (!fexist("/etc/mtab"))
-		symlink("../proc/self/mounts", "/etc/mtab");
+		ln("../proc/self/mounts", "/etc/mtab");
 
 	/* Void Linux has a uuidd that runs as uuid:uuid and needs /run/uuid */
 	mksubsys("/var/run/uuidd", 0755, "uuidd", "uuidd");
@@ -188,7 +198,7 @@ static void setup(void *arg)
 	mksubsys("/var/run/sudo", 0711, "root", "root");
 	mksubsys("/var/run/sudo/ts", 0700, "root", "root");
 	if (whichp("restorecon"))
-		run("restorecon /var/run/sudo /var/run/sudo/ts");
+		run("restorecon /var/run/sudo /var/run/sudo/ts", "restorecon");
 
 	umask(prev);
 }

plugins/dbus.c

@@ -22,7 +22,11 @@
  */
 
 #include <sys/types.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "config.h"
@@ -35,7 +39,13 @@
 #define ARGS   "--nofork --system --syslog-only"
 #define DESC   "D-Bus message bus daemon"
 
+#ifndef DAEMONUSER
 #define DAEMONUSER "messagebus"
+#endif
+
+#ifndef DAEMONPIDFILE
+#define DAEMONPIDFILE "/var/run/dbus/pid"
+#endif
 
 static void setup(void *arg)
 {
@@ -61,11 +71,11 @@ static void setup(void *arg)
 		run_interactive("dbus-uuidgen --ensure", "Creating machine UUID for D-Bus");
 
 	/* Clean up from any previous pre-bootstrap run */
-	remove("/var/run/dbus/pid");
+	remove(DAEMONPIDFILE);
 
 	/* Register service with Finit */
-	snprintf(line, sizeof(line), "[S12345789] cgroup.system @%s:%s %s %s -- %s",
-		 DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC);
+	snprintf(line, sizeof(line), "[S12345789] cgroup.system pid:!%s @%s:%s %s %s -- %s",
+		 DAEMONPIDFILE, DAEMONUSER, DAEMONUSER, cmd, ARGS, DESC);
 	if (service_register(SVC_TYPE_SERVICE, line, global_rlimit, NULL))
 		_pe("Failed registering %s", DAEMON);
 	free(cmd);

plugins/modprobe.c

@@ -40,11 +40,15 @@
 #include <sys/stat.h>
 #include <sys/time.h>		/* gettimeofday() */
 #include <sys/types.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "config.h"
 #include "finit.h"
-#include "helpers.h"
+#include "util.h"
 #include "plugin.h"
 
 struct module {

plugins/modules-load.c

@@ -21,10 +21,14 @@
  * THE SOFTWARE.
  */
 
-#include <lite/lite.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
@@ -40,36 +44,42 @@
 
 static void load(void *arg)
 {
-	FILE *fp;
-	DIR *dirp;
-	struct dirent *direntp;
+	struct dirent *d;
 	char line[256];
 	int index = 1;
+	FILE *fp;
+	DIR *dir;
 
 	_d("Scanning " MODULES_LOAD_PATH " for config files ...");
 
-	dirp = opendir(MODULES_LOAD_PATH);
-	if (!dirp) return;
+	dir = opendir(MODULES_LOAD_PATH);
+	if (!dir)
+		return;
 
-	while ((direntp = readdir(dirp)))
-	{
+	while ((d = readdir(dir))) {
 		char module_path[PATH_MAX];
+
 		strlcpy(module_path, MODULES_LOAD_PATH "/", sizeof(module_path));
-		strlcat(module_path, direntp->d_name, sizeof(module_path));
+		strlcat(module_path, d->d_name, sizeof(module_path));
 
 		fp = fopen(module_path, "r");
-		if (!fp) continue;
+		if (!fp)
+			continue;
 
 		while (fgets(line, sizeof(line), fp)) {
 			char cmd[CMD_SIZE], *mod, *args;
 
 			mod = strip_line(line);
-			if (!*mod) continue;
+			if (!*mod)
+				continue;
 
 			mod = chomp(mod);
-			if (!mod || !*mod) continue;
+			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);
@@ -80,7 +90,7 @@ static void load(void *arg)
 		fclose(fp);
 	}
 
-	closedir(dirp);
+	closedir(dir);
 }
 
 static plugin_t plugin = {

plugins/netlink.c

@@ -1,3 +1,4 @@
+
 /* Netlink plugin for IFUP/IFDN and GW events
  *
  * Copyright (C) 2009-2011  Mårten Wikström <marten.wikstrom@keystream.se>
@@ -231,6 +232,7 @@ static int nl_parse(int sd)
 	while (1) {
 		struct nlmsghdr *nh;
 		ssize_t len;
+		size_t l;
 
 		while ((len = recv(sd, nl_buf, NL_BUFSZ, 0)) < 0) {
 			switch (errno) {
@@ -251,9 +253,9 @@ static int nl_parse(int sd)
 			return -1;
 		}
 
-		_d("recv %lld bytes", len);
-
-		for (nh = (struct nlmsghdr *)nl_buf; NLMSG_OK(nh, len); nh = NLMSG_NEXT(nh, 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) {
@@ -354,7 +356,7 @@ static void nl_resync(int all)
 
 	if (all) {
 		_d("============================ RESYNC =================================");
-		/* this doesn't update condtions, and thus does not stop services */
+		/* this doesn't update conditions, and thus does not stop services */
 		cond_deassert("net/");
 
 		nl_resync_ifaces(sd, seq++);
@@ -448,6 +450,7 @@ PLUGIN_INIT(plugin_init)
 PLUGIN_EXIT(plugin_exit)
 {
 	plugin_unregister(&plugin);
+	close(plugin.io.fd);
 }
 
 /**

plugins/pidfile.c

@@ -84,8 +84,10 @@ static void pidfile_update_conds(char *dir, char *name, uint32_t mask)
 	mkcond(svc, cond, sizeof(cond));
 	if (mask & (IN_CLOSE_WRITE | IN_ATTRIB | IN_MODIFY | IN_MOVED_TO)) {
 		svc_started(svc);
-		if (!svc_has_pidfile(svc))
+		if (!svc_has_pidfile(svc)) {
+			_d("Setting %s PID file to %s", svc->name, fn);
 			pid_file_set(svc, fn, 1);
+		}
 
 		if (svc_is_forking(svc)) {
 			pid_t pid;
@@ -303,8 +305,8 @@ PLUGIN_INIT(plugin_init)
 
 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_pidfile);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_pidfile);
 }
 
 /**

plugins/procps.c

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

plugins/resolvconf.c

@@ -21,7 +21,11 @@
  * THE SOFTWARE.
  */
 
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"

plugins/rtc.c

@@ -24,7 +24,11 @@
 #include <time.h>
 #include <sys/ioctl.h>
 #include <linux/rtc.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
@@ -152,8 +156,18 @@ static void rtc_restore(void *arg)
 			logit(LOG_ERR, "RTC has no previously saved (valid) time.");
 		else
 			logit(LOG_ERR, "RTC error code %d: %s", errno, strerror(errno));
+
+		/* Been here already? */
+		if (rc)
+			goto out;
+
+		/* Attempt to set RTC to a sane value ... */
+		tv.tv_sec = RTC_TIMESTAMP_BEGIN_2000;
+		if (!gmtime_r(&tv.tv_sec, &tm))
+			goto out;
+
+		logit(LOG_NOTICE, "Resetting RTC to kernel default, 2000-01-01 00:00.");
 		rc = 2;
-		goto out;
 	}
 
 	print_desc(NULL, "Restoring system clock (UTC) from RTC");

plugins/sys.c

@@ -1,4 +1,4 @@
-/* System condtion event monitor for the Finit condition engine
+/* System condition event monitor for the Finit condition engine
  *
  * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
  *
@@ -41,19 +41,31 @@ static int sys_add_path(struct iwatch *iw, char *path)
 	return iwatch_add(iw, path, IN_ONLYDIR | IN_CLOSE_WRITE);
 }
 
+/*
+ * unlink conditions with no active task/service, otherwise they may
+ * trigger inadvertently when calling `initctl reload` to activate
+ * a new configuration.
+ */
 static void sys_update_conds(char *dir, char *name, uint32_t mask)
 {
-	char fn[PATH_MAX];
+	char path[256];
 	char *cond;
+	char *ptr;
 
-	paste(fn, sizeof(fn), dir, name);
-	cond = strstr(fn, COND_BASE);
+	ptr = strrchr(name, '/');
+	if (ptr)
+		snprintf(path, sizeof(path), "%s/%s", dir, ++ptr);
+	else
+		snprintf(path, sizeof(path), "%s/%s", dir, name);
+
+	cond = strstr(path, COND_BASE);
 	if (!cond)
 		return;
 
 	cond += strlen(COND_BASE) + 1;
 	_d("cond: %s set: %d", cond, mask & IN_CREATE ? 1 : 0);
-	cond_update(cond);
+	if (!cond_update(cond))
+		unlink(path);
 }
 
 /* synthesize events in case of new run dirs */
@@ -185,8 +197,8 @@ PLUGIN_INIT(plugin_init)
 
 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_sys);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_sys);
 }
 
 /**

plugins/tty.c

@@ -27,7 +27,11 @@
 #include <unistd.h>		/* read() */
 #include <sys/inotify.h>
 #include <sys/stat.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
@@ -112,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);
 }
 
 /**

plugins/urandom.c

@@ -1,4 +1,4 @@
-/* Setup random seed
+/* Setup and save random seed at boot/shutdown
  *
  * Copyright (c) 2012-2021  Joachim Wiberg <troglobit@gmail.com>
  *
@@ -22,19 +22,34 @@
  */
 
 #include <unistd.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/time.h>		/* gettimeofday() */
 #include <sys/types.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
+#include <linux/random.h>
 
 #include "config.h"
 #include "finit.h"
 #include "helpers.h"
 #include "plugin.h"
 
+#ifndef RANDOM_BYTES
+#define RANDOM_BYTES (32*1024)
+#endif
+
 static void setup(void *arg)
 {
 #ifdef RANDOMSEED
+	struct rand_pool_info *rpi;
+	ssize_t len = 0;
+	int rc = -1;
+	int fd, err;
+
 	if (rescue) {
 		_d("Skipping %s plugin in rescue mode.", __FILE__);
 		return;
@@ -67,7 +82,59 @@ static void setup(void *arg)
 	}
 
 	print_desc("Initializing random number generator", NULL);
-	print_result(512 != copyfile(RANDOMSEED, "/dev/urandom", 0, 0));
+
+	/*
+	 * Simply copying our saved entropy to /dev/urandom doesn't
+	 * increment the kernel "entropy count", instead we must use
+	 * the ioctl below.
+	 */
+	fd = open(RANDOMSEED, O_RDONLY);
+	if (fd < 0)
+		goto fallback;
+
+	rpi = malloc(sizeof(*rpi) + RANDOM_BYTES);
+	if (!rpi) {
+		close(fd);
+		goto fallback;
+	}
+
+	do {
+		ssize_t num;
+
+		num = read(fd, &rpi->buf[len], RANDOM_BYTES - len);
+		if (num <= 0) {
+			if (num == -1 && errno == EINTR)
+				continue;
+			if (len > 0)
+				break;
+
+			close(fd);
+			free(rpi);
+			goto fallback;
+		}
+
+		len += num;
+	} while (len < RANDOM_BYTES);
+	close(fd);
+
+	fd = open("/dev/urandom", O_WRONLY);
+	if (fd < 0) {
+		free(rpi);
+		goto fallback;
+	}
+
+	rpi->buf_size = len;
+	rpi->entropy_count = len * 8;
+	rc = ioctl(fd, RNDADDENTROPY, rpi);
+	err = errno;
+	close(fd);
+	free(rpi);
+	if (rc < 0)
+		logit(LOG_ERR, "Failed adding entropy to kernel random pool: %s", strerror(err));
+	print_result(rc < 0);
+	return;
+fallback:
+	print_result(512 > copyfile(RANDOMSEED, "/dev/urandom", 0, 0));
 #endif
 }
 
@@ -84,7 +151,7 @@ static void save(void *arg)
 	prev = umask(077);
 
 	print_desc("Saving random seed", NULL);
-	print_result(512 != copyfile("/dev/urandom", RANDOMSEED, 512, 0));
+	print_result(RANDOM_BYTES != copyfile("/dev/urandom", RANDOMSEED, RANDOM_BYTES, 0));
 
 	umask(prev);
 #endif

plugins/usr.c

@@ -1,4 +1,4 @@
-/* User-defined condtion event monitor for the Finit condition engine
+/* User-defined condition event monitor for the Finit condition engine
  *
  * Copyright (c) 2021  Joachim Wiberg <troglobit@gmail.com>
  *
@@ -97,6 +97,8 @@ static void usr_init(void *arg)
 
 	if (iwatch_add(&iw_usr, path, IN_ONLYDIR))
 		iwatch_exit(&iw_usr);
+
+	free(path);
 }
 
 static plugin_t plugin = {
@@ -121,8 +123,8 @@ PLUGIN_INIT(plugin_init)
 
 PLUGIN_EXIT(plugin_exit)
 {
-	iwatch_exit(&iw_usr);
 	plugin_unregister(&plugin);
+	iwatch_exit(&iw_usr);
 }
 
 /**

plugins/x11-common.c

@@ -24,7 +24,11 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
@@ -54,7 +58,7 @@ static void setup(void *arg)
 	if ((fd = open("/var/run/console/console.lock", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
 		write(fd, username, strlen(username));
 		close(fd);
-		run("pam_console_apply");
+		run("pam_console_apply", "pam-console");
 	}
 #endif
 
@@ -62,7 +66,7 @@ static void setup(void *arg)
 	makedir("/tmp/.ICE-unix", 01777);
 
 	if (whichp("restorecon"))
-		run("restorecon /tmp/.ICE-unix /tmp/.X11-unix");
+		run("restorecon /tmp/.ICE-unix /tmp/.X11-unix", "restorecon");
 
 	umask(prev);
 }

src/.gitignore

@@ -1,5 +1,6 @@
 .deps/*
 finit
+getty
 initctl
 keventd
 logit

src/Makefile.am

@@ -8,7 +8,10 @@ AM_LDFLAGS         = -export-dynamic
 endif
 
 sbin_PROGRAMS        = finit initctl
-pkglibexec_PROGRAMS  = keventd logit sulogin
+pkglibexec_PROGRAMS  = getty logit sulogin
+if KEVENTD
+pkglibexec_PROGRAMS += keventd
+endif
 if WATCHDOGD
 pkglibexec_PROGRAMS += watchdogd
 endif
@@ -16,8 +19,14 @@ endif
 finit_pkglibdir      = $(pkglibdir)
 finit_pkglib_SCRIPTS = rescue.conf sample.conf
 
+getty_SOURCES        = finit.h getty.c helpers.h logrotate.c stty.c utmp-api.c utmp-api.h
+getty_CFLAGS         = -W -Wall -Wextra -std=gnu99
+getty_CFLAGS        += $(lite_CFLAGS)
+getty_LDADD          = $(lite_LIBS)
+
 keventd_SOURCES      = keventd.c iwatch.c iwatch.h util.c util.h
 keventd_CFLAGS       = -W -Wall -Wextra -std=gnu99
+keventd_CFLAGS      += $(lite_CFLAGS)
 keventd_LDADD        = $(lite_LIBS)
 
 sulogin_SOURCES      = sulogin.c
@@ -33,7 +42,7 @@ finit_SOURCES      = api.c	cgroup.c	cgroup.h	\
 		     cond.c	cond-w.c	cond.h		\
 		     conf.c	conf.h				\
 		     exec.c	finit.c		finit.h		\
-		     getty.c	stty.c				\
+		     		stty.c				\
 		     helpers.c	helpers.h			\
 		     iwatch.c   iwatch.h			\
 		     log.c	log.h				\

src/api.c

@@ -29,7 +29,11 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 #include <uev/uev.h>
 
 #include "config.h"
@@ -47,12 +51,12 @@
 extern svc_t *wdog;
 static uev_t api_watcher;
 
-static int call(int (*action)(svc_t *), char *buf, size_t len)
+static int call(int (*action)(svc_t *, void *), char *buf, size_t len)
 {
-	return svc_parse_jobstr(buf, len, action, NULL);
+	return svc_parse_jobstr(buf, len, NULL, action, NULL);
 }
 
-static int stop(svc_t *svc)
+static int stop(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -63,7 +67,7 @@ static int stop(svc_t *svc)
 	return 0;
 }
 
-static int start(svc_t *svc)
+static int start(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -79,7 +83,7 @@ static int start(svc_t *svc)
  *       responsibility of initctl to do.  Otherwise we'd block PID 1,
  *       or introduce some nasty race conditions.
  */
-static int restart(svc_t *svc)
+static int restart(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -91,7 +95,7 @@ static int restart(svc_t *svc)
 	return 0;
 }
 
-static int reload(svc_t *svc)
+static int reload(svc_t *svc, void *user_data)
 {
 	if (!svc)
 		return 1;
@@ -110,8 +114,28 @@ static int do_start  (char *buf, size_t len) { return call(start,   buf, len); }
 static int do_restart(char *buf, size_t len) { return call(restart, buf, len); }
 static int do_reload (char *buf, size_t len) { return call(reload,  buf, len); }
 
+static int do_signal_svc(svc_t *svc, void *user_data)
+{
+	int signo;
+
+	if (!svc || !user_data || !svc_is_running(svc))
+		return 1;
+
+	signo = *(int *)user_data;
+	return !!kill(svc->pid, signo);
+}
+
+static int do_signal(char *buf, size_t len, int sig)
+{
+	/* Sanity check: do we know this signal? */
+	if (!*sig2str(sig))
+		return 1;
+
+	return svc_parse_jobstr(buf, len, &sig, do_signal_svc, NULL);
+}
+
 static char query_buf[368];
-static int missing(char *job, char *id)
+static int missing(char *job, char *id, void *user_data)
 {
 	char buf[20];
 
@@ -129,7 +153,7 @@ static int missing(char *job, char *id)
 static int do_query(char *buf, size_t len)
 {
 	query_buf[0] = 0;
-	if (svc_parse_jobstr(buf, len, NULL, missing)) {
+	if (svc_parse_jobstr(buf, len, NULL, NULL, missing)) {
 		memcpy(buf, query_buf, len);
 		return 1;
 	}
@@ -226,10 +250,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));
 		}
@@ -387,7 +411,7 @@ static void api_cb(uev_t *w, void *arg, int events)
 				break;
 			}
 
-			_e("Request to hand-over wdog ... to PID %d", rq.runlevel);
+			_d("Request to hand-over wdog ... to PID %d", rq.runlevel);
 			svc = svc_find_by_pid(rq.runlevel);
 			if (!svc) {
 				logit(LOG_ERR, "Cannot find PID %d, not registered.", rq.runlevel);
@@ -403,7 +427,7 @@ static void api_cb(uev_t *w, void *arg, int events)
 
 				if (wdog->protect) {
 					logit(LOG_NOTICE, "Stopping and deleting built-in watchdog.");
-					stop(wdog);
+					stop(wdog, NULL);
 					svc_del(wdog);
 				}
 			}
@@ -413,7 +437,7 @@ static void api_cb(uev_t *w, void *arg, int events)
 		case INIT_CMD_SVC_ITER:
 //			_d("svc iter, first: %d", rq.runlevel);
 			/*
-			 * XXX: This severly limits the number of
+			 * XXX: This severely limits the number of
 			 * simultaneous client connections, but will
 			 * have to do for now.
 			 */
@@ -439,6 +463,13 @@ static void api_cb(uev_t *w, void *arg, int events)
 			send_svc(sd, do_find_byc(rq.data, sizeof(rq.data)));
 			goto leave;
 
+		case INIT_CMD_SIGNAL:
+			/* runlevel is reused for signal */
+			_d("svc signal %d: %s", rq.runlevel, rq.data);
+			strterm(rq.data, sizeof(rq.data));
+			result = do_signal(rq.data, sizeof(rq.data), rq.runlevel);
+			break;
+
 		default:
 			_d("Unsupported cmd: %d", rq.cmd);
 			break;
@@ -466,12 +497,13 @@ error:
 
 int api_init(uev_ctx_t *ctx)
 {
-	int sd;
-	mode_t oldmask;
 	struct sockaddr_un sun = {
 		.sun_family = AF_UNIX,
 		.sun_path   = INIT_SOCKET,
 	};
+	mode_t oldmask;
+	int uid, gid;
+	int sd;
 
 	_d("Setting up external API socket ...");
 	sd = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
@@ -480,20 +512,26 @@ int api_init(uev_ctx_t *ctx)
 		return 1;
 	}
 
+	uid = geteuid();
+	gid = getgroup(DEFGROUP);
+
 	erase(INIT_SOCKET);
-	oldmask = umask(0077);
+	oldmask = umask(0117);
 	if (-1 == bind(sd, (struct sockaddr*)&sun, sizeof(sun)))
 		goto error;
 
 	if (-1 == listen(sd, 10))
 		goto error;
 
+	if (chown(INIT_SOCKET, uid, gid))
+		_pe("Failed setting group %s on %s", DEFGROUP, INIT_SOCKET);
+
 	umask(oldmask);
 	if (!uev_io_init(ctx, &api_watcher, api_cb, NULL, sd, UEV_READ))
 		return 0;
 
 error:
-	_pe("Failed intializing API socket");
+	_pe("Failed initializing API socket");
 	umask(oldmask);
 	close(sd);
 	return 1;

src/cgroup.c

@@ -24,8 +24,13 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <lite/lite.h>
-#include <lite/queue.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+# include <libite/queue.h>	/* BSD sys/queue.h API */
+#else
+# include <lite/lite.h>
+# include <lite/queue.h>	/* BSD sys/queue.h API */
+#endif
 #include <sys/mount.h>
 #include <sys/sysinfo.h>		/* get_nprocs_conf() */
 
@@ -42,7 +47,7 @@ struct cg {
 	char *cfg;		/* kernel settings */
 
 	int  active;		/* for mark & sweep */
-	int  protected;		/* for init/, user/, & system/ */
+	int  is_protected;	/* for init/, user/, & system/ */
 };
 
 static TAILQ_HEAD(, cg) cgroups = TAILQ_HEAD_INITIALIZER(cgroups);
@@ -51,6 +56,7 @@ static char controllers[256];
 
 static struct iwatch iw_cgroup;
 static uev_t cgw;
+static int avail;
 
 
 static void cgset(const char *path, char *ctrl, char *prop)
@@ -159,6 +165,9 @@ static int cgroup_leaf_init(char *group, char *name, int pid, const char *cfg)
 
 int cgroup_user(char *name, int pid)
 {
+	if (!avail)
+		return 0;
+
 	return cgroup_leaf_init("user", name, pid, NULL);
 }
 
@@ -166,6 +175,9 @@ int cgroup_service(char *name, int pid, struct cgroup *cg)
 {
 	char *group = "system";
 
+	if (!avail)
+		return 0;
+
 	if (cg && cg->name[0]) {
 		char path[256];
 
@@ -302,8 +314,11 @@ void cgroup_mark_all(void)
 {
 	struct cg *cg;
 
+	if (!avail)
+		return;
+
 	TAILQ_FOREACH(cg, &cgroups, link) {
-		if (cg->protected)
+		if (cg->is_protected)
 			continue;
 
 		cg->active = 0;
@@ -318,6 +333,9 @@ void cgroup_cleanup(void)
 	struct cg *cg, *tmp;
 	char path[256];
 
+	if (!avail)
+		return;
+
 	TAILQ_FOREACH_SAFE(cg, &cgroups, link, tmp) {
 		if (cg->active)
 			continue;
@@ -330,10 +348,13 @@ void cgroup_cleanup(void)
 /*
  * Add, or update, settings for top-level cgroup
  */
-int cgroup_add(char *name, char *cfg, int protected)
+int cgroup_add(char *name, char *cfg, int is_protected)
 {
 	struct cg *cg;
 
+	if (!avail)
+		return 0;
+
 	if (!name)
 		return -1;
 	if (!cfg)
@@ -364,7 +385,7 @@ int cgroup_add(char *name, char *cfg, int protected)
 		free(cg);
 		return -1;
 	}
-	cg->protected = protected;
+	cg->is_protected = is_protected;
 	cg->active = 1;
 
 	return 0;
@@ -378,6 +399,9 @@ int cgroup_del(char *dir)
 	struct cg *cg;
 	char path[256];
 
+	if (!avail)
+		return 0;
+
 	TAILQ_FOREACH(cg, &cgroups, link) {
 		snprintf(path, sizeof(path), FINIT_CGPATH "/%s", cg->name);
 		if (strcmp(path, dir))
@@ -409,6 +433,9 @@ void cgroup_config(void)
 {
 	struct cg *cg;
 
+	if (!avail)
+		return;
+
 	TAILQ_FOREACH(cg, &cgroups, link) {
 		char path[256];
 		int leaf = 0;
@@ -437,14 +464,24 @@ void cgroup_init(uev_ctx_t *ctx)
 	int fd;
 
 	if (mount("none", FINIT_CGPATH, "cgroup2", opts, NULL)) {
-		_pe("Failed mounting cgroup v2");
+		if (errno == ENOENT)
+			logit(LOG_NOTICE, "Kernel does not support cgroups v2, disabling.");
+		else if (errno == EPERM) /* Probably inside an unpriviliged container */
+			logit(LOG_NOTICE, "Not allowed to mount cgroups v2, disabling.");
+		else
+			_pe("Failed mounting cgroup v2");
+		avail = 0;
 		return;
 	}
+	avail = 1;
 
 	/* Find available controllers */
 	fp = fopen(FINIT_CGPATH "/cgroup.controllers", "r");
 	if (!fp) {
 		_pe("Failed opening %s", FINIT_CGPATH "/cgroup.controllers");
+	abort:
+		umount(FINIT_CGPATH);
+		avail = 0;
 		return;
 	}
 
@@ -460,9 +497,26 @@ void cgroup_init(uev_ctx_t *ctx)
 
 	fclose(fp);
 
+	/* Check for cpu controller, abort if missing */
+	if (!strstr(controllers, "+cpu")) {
+		logit(LOG_NOTICE, "Missing CPU controller, disabling cgroup support.");
+		goto abort;
+	}
+
 	/* Enable all controllers */
-	if (fnwrite(controllers, FINIT_CGPATH "/cgroup.subtree_control"))
+	if (fnwrite(controllers, FINIT_CGPATH "/cgroup.subtree_control")) {
 		_pe("Failed enabling %s for %s", controllers, FINIT_CGPATH "/cgroup.subtree_control");
+		goto abort;
+	}
+
+	/* prepare cgroup.events watcher */
+	fd = iwatch_init(&iw_cgroup);
+	if (uev_io_init(ctx, &cgw, cgroup_events_cb, NULL, fd, UEV_READ)) {
+		_pe("Failed setting up cgroup.events watcher");
+		iwatch_exit(&iw_cgroup);
+		close(fd);
+		goto abort;
+	}
 
 	/* Default (protected) groups, PID 1, services, and user/login processes */
 	cgroup_add("init",   "cpu.weight:100",  1);
@@ -471,14 +525,12 @@ void cgroup_init(uev_ctx_t *ctx)
 	cgroup_config();
 
 	/* Move ourselves to init (best effort, otherwise run in 'root' group */
-	if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs"))
-		_pe("Failed moving PID 1 to cgroup ", FINIT_CGPATH "/init");
-
-	/* prepare cgroup.events watcher */
-	fd = iwatch_init(&iw_cgroup);
-	if (uev_io_init(ctx, &cgw, cgroup_events_cb, NULL, fd, UEV_READ)) {
-		_pe("Failed setting up cgroup.events watcher");
+	if (fnwrite("1", FINIT_CGPATH "/init/cgroup.procs")) {
+		_pe("Failed moving PID 1 to cgroup %s", FINIT_CGPATH "/init");
+		uev_io_stop(&cgw);
+		iwatch_exit(&iw_cgroup);
 		close(fd);
+		goto abort;
 	}
 }
 

src/cgroup.h

@@ -34,7 +34,7 @@ struct cgroup {
 void cgroup_mark_all(void);
 void cgroup_cleanup (void);
 
-int  cgroup_add     (char *name, char *cfg, int protected);
+int  cgroup_add     (char *name, char *cfg, int is_protected);
 int  cgroup_del     (char *dir);
 void cgroup_config  (void);
 

src/cgutil.c

@@ -30,7 +30,11 @@
 #include <stdlib.h>
 #include <search.h>
 #include <inttypes.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 #include <sys/sysinfo.h>		/* sysinfo() */
 
 #include "cgutil.h"
@@ -49,6 +53,10 @@ uint64_t total_ram;			/* From sysinfo() */
 struct cg  dummy;			/* empty result "NULL"      */
 struct cg *list;
 
+int cgroup_avail(void)
+{
+	return fismnt(FINIT_CGPATH);
+}
 
 char *pid_cmdline(int pid, char *buf, size_t len)
 {

src/cgutil.h

@@ -52,6 +52,8 @@ struct cg {
 	} cg_cpu;
 };
 
+int cgroup_avail(void);
+
 char *pid_cmdline (int pid, char *buf, size_t len);
 char *pid_comm    (int pid, char *buf, size_t len);
 char *pid_cgroup  (int pid, char *buf, size_t len);

src/client.c

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

src/cond-w.c

@@ -23,8 +23,12 @@
 
 #include <ftw.h>
 #include <libgen.h>
-#include <lite/lite.h>
 #include <stdio.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "cond.h"
@@ -164,18 +168,22 @@ int cond_set_path(const char *path, enum cond_state next)
 }
 
 /* Should only be used by cond_set*(), cond_clear(), and usr/sys plugins! */
-void cond_update(const char *name)
+int cond_update(const char *name)
 {
 	svc_t *svc, *iter = NULL;
+	int affects = 0;
 
 	_d("%s", name);
 	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
 		if (!svc_has_cond(svc) || !cond_affects(name, svc->cond))
 			continue;
 
+		affects++;
 		_d("%s: match <%s> %s(%s)", name ?: "nil", svc->cond, svc->desc, svc->cmd);
 		service_step(svc);
 	}
+
+	return affects;
 }
 
 int cond_set_noupdate(const char *name)
@@ -199,21 +207,33 @@ void cond_set(const char *name)
 	cond_update(name);
 }
 
-void cond_set_oneshot(const char *name)
+int cond_set_oneshot_noupdate(const char *name)
 {
 	const char *path;
 
 	if (string_compare(name, "nop"))
-		return;
+		return 1;
 
 	path = cond_path(name);
 	_d("%s => %s", name, path);
 
 	if (cond_checkpath(path))
+		return 1;
+
+	if (symlink(_PATH_RECONF, path) && errno != EEXIST) {
+		_pe("Failed creating onshot cond %s", name);
+		return 1;
+	}
+
+	return 0;
+}
+
+void cond_set_oneshot(const char *name)
+{
+	_d("%s", name);
+	if (cond_set_oneshot_noupdate(name))
 		return;
 
-	if (symlink(_PATH_RECONF, path) && errno != EEXIST)
-		_pe("Failed creating onshot cond %s", name);
 	cond_update(name);
 }
 
@@ -257,7 +277,7 @@ static int do_assert(const char *fpath, const struct stat *sb, int tflg, struct
 
 	nm = strstr((char *)fpath, COND_BASE);
 	if (!nm) {
-		_e("Incorrect condtion path %s, cannot %sassert", fpath, set ? "re" : "de");
+		_e("Incorrect condition path %s, cannot %sassert", fpath, set ? "re" : "de");
 		return 1;
 	}
 

src/cond.c

@@ -21,8 +21,12 @@
  * THE SOFTWARE.
  */
 
-#include <lite/lite.h>
 #include <stdio.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "cond.h"

src/cond.h

@@ -2,7 +2,8 @@
 #define FINIT_COND_H_
 
 #include <paths.h>
-#include <svc.h>
+
+#include "svc.h"
 
 #define COND_BASE      "finit/cond"
 #define COND_PID       "pid/"
@@ -30,7 +31,7 @@ enum cond_state cond_get     (const char *name);
 enum cond_state cond_get_agg (const char *names);
 int             cond_affects (const char *name, const char *names);
 
-void cond_update      (const char *name);
+int  cond_update      (const char *name);
 int  cond_set_path    (const char *path, enum cond_state new);
 void cond_set         (const char *name);
 void cond_set_oneshot (const char *name);
@@ -38,6 +39,7 @@ void cond_clear       (const char *name);
 void cond_reload      (void);
 
 int cond_set_noupdate (const char *name);
+int cond_set_oneshot_noupdate(const char *name);
 int cond_clear_noupdate(const char *name);
 
 void cond_reassert    (const char *pat);

src/conf.c

@@ -28,14 +28,20 @@
 #include <string.h>
 #include <sys/inotify.h>
 #include <sys/resource.h>
-#include <lite/lite.h>
-#include <lite/queue.h>		/* BSD sys/queue.h API */
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+# include <libite/queue.h>	/* BSD sys/queue.h API */
+#else
+# include <lite/lite.h>
+# include <lite/queue.h>	/* BSD sys/queue.h API */
+#endif
 #include <time.h>
 #include <glob.h>
 
 #include "finit.h"
 #include "cond.h"
 #include "iwatch.h"
+#include "private.h"
 #include "service.h"
 #include "tty.h"
 #include "helpers.h"
@@ -66,22 +72,6 @@ static TAILQ_HEAD(head, conf_change) conf_change_list = TAILQ_HEAD_INITIALIZER(c
 static int  parse_conf(char *file, int is_rcsd);
 static void drop_changes(void);
 
-static void hide_args(int argc, char *argv[])
-{
-	/*
-	 * Hide command line arguments from ps (in particular for
-	 * forked children that don't execv()).  This is an ugly
-	 * hack that only works on Linux.
-	 * https://web.archive.org/web/20110227041321/http://netsplit.com/2007/01/10/hiding-arguments-from-ps/
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-}
-
 int get_bool(char *arg, int default_value)
 {
 	if (!arg)
@@ -96,8 +86,9 @@ fallback:
 }
 
 /*
- * finit.debug = [on,off]
- * finit.show_status = [on,off]
+ * finit.debug  = [on,off]
+ * finit.status = [on,off]     (compat finit.show_status)
+ * finit.status_style = [old,classic,modern]
  */
 static void parse_finit_opts(char *opt)
 {
@@ -125,7 +116,7 @@ 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;
 	}
@@ -145,24 +136,27 @@ static void parse_arg(char *arg)
 		single = 1;
 }
 
-void conf_parse_cmdline(int argc, char *argv[])
+#ifdef KERNEL_CMDLINE
+/*
+ * Parse /proc/cmdline to find args for init.  Don't use this!
+ *
+ * Instead, rely on the kernel to give Finit its arguments as
+ * regular argc + argv[].  Only use this if the system you run
+ * on has a broken initramfs system that cannot forward args
+ * to Finit properly.
+ */
+static void parse_kernel_cmdline(void)
 {
-	int dbg = 0;
-	FILE *fp;
 	char line[LINE_SIZE], *cmdline, *tok;
-
-	for (int i = 1; i < argc; i++)
-		parse_arg(argv[i]);
-
-	hide_args(argc, argv);
+	FILE *fp;
 
 	fp = fopen("/proc/cmdline", "r");
 	if (!fp)
-		goto done;
+		return;
 
 	if (!fgets(line, sizeof(line), fp)) {
 		fclose(fp);
-		goto done;
+		return;
 	}
 
 	cmdline = chomp(line);
@@ -173,29 +167,60 @@ void conf_parse_cmdline(int argc, char *argv[])
 		parse_arg(tok);
 	}
 	fclose(fp);
+}
+#else
+#define parse_kernel_cmdline()
+#endif
 
-done:
-	log_init(dbg);
+static void parse_kernel_loglevel(void)
+{
+	char line[LINE_SIZE], *ptr;
+	FILE *fp;
+	int val;
+
+	fp = fopen("/proc/sys/kernel/printk", "r");
+	if (!fp)
+		return;
+
+	if (!fgets(line, sizeof(line), fp)) {
+		fclose(fp);
+		return;
+	}
+	fclose(fp);
+
+	ptr = chomp(line);
+	_d("%s", ptr);
+	val = atoi(ptr);
+	if (val >= 7)
+		kerndebug = 1;
+}
+
+/*
+ * Kernel gives us all non-kernel options on our cmdline
+ */
+void conf_parse_cmdline(int argc, char *argv[])
+{
+	for (int i = 1; i < argc; i++)
+		parse_arg(argv[i]);
+
+	parse_kernel_cmdline();
+	parse_kernel_loglevel();
 }
 
 static int kmod_exists(char *mod)
 {
+	char buf[256];
 	int found = 0;
 	FILE *fp;
-	char buf[256];
-	size_t len;
-
-	for (len = 0; mod[len]; len++) {
-		if (mod[len] == ' ' || mod[len] == '\t')
-			break;
-	}
 
 	fp = fopen("/proc/modules", "r");
 	if (!fp)
 		return 0;
 
-	while (!found && (fgets(buf, sizeof(buf), fp))) {
-		if (!strncmp(buf, mod, len))
+	while (!found && fgets(buf, sizeof(buf), fp)) {
+		char *kmod = strtok(buf, " \t");
+
+		if (kmod && !strcmp(kmod, mod))
 			found = 1;
 	}
 	fclose(fp);
@@ -203,22 +228,26 @@ static int kmod_exists(char *mod)
 	return found;
 }
 
-static void kmod_load(char *line)
+static void kmod_load(char *mod)
 {
-	char *mod;
+	char module[64] = { 0 };
 	char cmd[CMD_SIZE];
 
 	if (runlevel != 0)
 		return;
 
-	mod = strip_line(line);
-	if (kmod_exists(mod))
+	/* Strip args for progress below and kmod_exists() */
+	strlcpy(module, mod, sizeof(module));
+	if (!strtok(module, " \t"))
+		return;
+
+	if (kmod_exists(module))
 		return;
 
 	strcpy(cmd, "modprobe ");
 	strlcat(cmd, mod, sizeof(cmd));
 
-	run_interactive(cmd, "Loading kernel module %s", mod);
+	run_interactive(cmd, "Loading kernel module %s", module);
 }
 
 /* Convert optional "[!123456789S]" string into a bitmask */
@@ -471,7 +500,7 @@ static void parse_static(char *line, int is_rcsd)
 
 	/* Kernel module to load */
 	if (BOOTSTRAP && MATCH_CMD(line, "module ", x)) {
-		kmod_load(x);
+		kmod_load(strip_line(x));
 		return;
 	}
 
@@ -542,6 +571,26 @@ static void parse_static(char *line, int is_rcsd)
 			cfglevel = 2; /* Fallback */
 		return;
 	}
+
+	/*
+	 * Periodic check and instability index leveler, seconds
+	 */
+	if (MATCH_CMD(line, "service-interval ", x)) {
+		char *token = strip_line(x);
+		const char *err = NULL;
+		int val;
+
+		/* 0 min to 1 day, should check at least daily */
+		val = strtonum(token, 0, 1440, &err);
+		if (!err) {
+			int disabled = !service_interval;
+
+			service_interval = val * 1000; /* to milliseconds */
+			if (disabled)
+				service_init();
+		}
+		return;
+	}
 }
 
 static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
@@ -578,7 +627,7 @@ static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
 		return;
 	}
 
-	/* Read contrl group limits */
+	/* Read control group limits */
 	if (MATCH_CMD(line, "cgroup ", x)) {
 		conf_parse_cgroup(x);
 		return;

src/exec.c

@@ -26,13 +26,20 @@
 
 #include <ctype.h>		/* isdigit() */
 #include <dirent.h>
+#include <err.h>
 #include <stdarg.h>
+#include <sysexits.h>
 #include <sys/ioctl.h>
 #include <sys/prctl.h>
 #include <sys/wait.h>
 #include <sys/ttydefaults.h>	/* Not included by default in musl libc */
 #include <termios.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
+#include <linux/vt.h>
 
 #include "finit.h"
 #include "cgroup.h"
@@ -64,91 +71,128 @@ int complete(char *cmd, int pid)
 	return status;
 }
 
-int run(char *cmd)
+static int do_redirect(void)
 {
+	FILE *fp;
+
+	fp = fopen("/dev/null", "w");
+	if (fp) {
+		int fd = fileno(fp);
+
+		dup2(fd, STDIN_FILENO);
+		dup2(fd, STDOUT_FILENO);
+		dup2(fd, STDERR_FILENO);
+
+		return fclose(fp);
+	}
+
+	return -1;
+}
+
+/*
+ * Run 'cmd' and wait for completion.  If 'log' is not NULL any output
+ * from the command is logged with the given string as prefix, use "" to
+ * skip.  If 'log' is NULL all output is redirected to /dev/null, which
+ * is what this function originally did.
+ */
+int run(char *cmd, char *log)
+{
+	char *args[NUM_ARGS + 1] = { 0 };
 	int status, result, i = 0;
-	char *args[NUM_ARGS + 1], *arg, *backup;
+	char *backup = NULL;
 	pid_t pid;
 
-	/* We must create a copy that is possible to modify. */
-	backup = arg = strdup(cmd);
-	if (!arg)
-		return 1; /* Failed allocating a string to be modified. */
+	if (!log) {
+		char *arg;
 
-	/* Split command line into tokens of an argv[] array. */
-	args[i++] = strsep(&arg, "\t ");
-	while (arg && i < NUM_ARGS) {
-		/* Handle run("su -c \"dbus-daemon --system\" messagebus");
-		 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
-		if (*arg == '\'' || *arg == '"') {
-			char *p, delim[2] = " ";
+		/* We must create a copy that is possible to modify. */
+		backup = arg = strdup(cmd);
+		if (!arg)
+			return 1;
 
-			delim[0]  = arg[0];
-			args[i++] = arg++;
-			strsep(&arg, delim);
-			 p     = arg - 1;
-			*p     = *delim;
-			*arg++ = 0;
-		} else {
-			args[i++] = strsep(&arg, "\t ");
+		/* Split command line into tokens of an argv[] array. */
+		args[i++] = strsep(&arg, "\t ");
+		while (arg && i < NUM_ARGS) {
+			/* Handle run("su -c \"dbus-daemon --system\" messagebus");
+			 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
+			if (*arg == '\'' || *arg == '"') {
+				char *p, delim[2] = " ";
+
+				delim[0]  = arg[0];
+				args[i++] = arg++;
+				strsep(&arg, delim);
+				 p     = arg - 1;
+				*p     = *delim;
+				*arg++ = 0;
+			} else {
+				args[i++] = strsep(&arg, "\t ");
+			}
 		}
-	}
-	args[i] = NULL;
+		args[i] = NULL;
 
-	if (i == NUM_ARGS && arg) {
-		_e("Command too long: %s", cmd);
-		free(backup);
-		errno = EOVERFLOW;
-		return 1;
+		if (i == NUM_ARGS && arg) {
+			_e("Command too long: %s", cmd);
+			free(backup);
+			errno = EOVERFLOW;
+			return 1;
+		}
 	}
 
 	pid = fork();
 	if (0 == pid) {
-		FILE *fp;
+		int rc = EX_OSERR;
 
-		/* Reset signal handlers that were set by the parent process */
-		sig_unblock();
 		setsid();
+		sig_unblock();
+		if (!log) {
+			do_redirect();
+			execvp(args[0], args);
+		} else {
+			char *pfx = *log ? ": " : "";
+			FILE *pp;
 
-		/* Always redirect stdio for run() */
-		fp = fopen("/dev/null", "w");
-		if (fp) {
-			int fd = fileno(fp);
+			pp = popen(cmd, "r");
+			if (pp) {
+				char buf[256];
 
-			dup2(fd, STDIN_FILENO);
-			dup2(fd, STDOUT_FILENO);
-			dup2(fd, STDERR_FILENO);
+				while (fgets(buf, sizeof(buf), pp)) {
+					chomp(buf);
+					logit(LOG_NOTICE, "%s%s%s", log, pfx, buf);
+				}
+
+				rc = pclose(pp);
+			}
 		}
 
-		sig_unblock();
-		execvp(args[0], args);
-
-		_exit(1); /* Only if execv() fails. */
+		_exit(rc);
 	} else if (-1 == pid) {
-		_pe("%s", args[0]);
-		free(backup);
+		_pe("%s", !log ? args[0] : cmd);
+		if (backup)
+			free(backup);
 
 		return -1;
 	}
 
 	status = complete(args[0], pid);
 	if (-1 == status) {
-		free(backup);
+		if (backup)
+			free(backup);
 		return 1;
 	}
 
 	result = WEXITSTATUS(status);
 	if (WIFEXITED(status)) {
-		_d("Started %s and ended OK: %d", args[0], result);
+		_d("Started '%s' and exit without signal, status: %d", cmd, result);
 	} else if (WIFSIGNALED(status)) {
-		_d("Process %s terminated by signal %d", args[0], WTERMSIG(status));
+		_d("Process '%s' terminated by signal %d", cmd, WTERMSIG(status));
 		if (!result)
 			result = 1; /* Must alert callee that the command did complete successfully.
 				     * This is necessary since not all programs trap signals and
 				     * change their return code accordingly. --Jocke */
 	}
 
-	free(backup);
+	if (backup)
+		free(backup);
 
 	return result;
 }
@@ -182,7 +226,7 @@ int run_interactive(char *cmd, char *fmt, ...)
 	}
 
 	/* Run cmd ... */
-	status = run(cmd);
+	status = run(cmd, "");
 
 	/* Restore stderr/stdout */
 	if (fp && !debug) {
@@ -218,7 +262,6 @@ int run_interactive(char *cmd, char *fmt, ...)
 
 int exec_runtask(char *cmd, char *args[])
 {
-	size_t i;
 	char buf[1024] = "";
 	char *argv[4] = {
 		"sh",
@@ -226,6 +269,7 @@ int exec_runtask(char *cmd, char *args[])
 		buf,
 		NULL
 	};
+	size_t i;
 
 	strlcat(buf, cmd, sizeof(buf));
 	for (i = 1; args[i]; i++) {
@@ -240,10 +284,8 @@ int exec_runtask(char *cmd, char *args[])
 
 static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit rlimit[])
 {
-	struct sigaction sa;
-	struct termios term;
 	char name[80];
-	int fd;
+	int fd, dummy;
 
 	fd = open(tty, O_RDWR);
 	if (fd < 0) {
@@ -254,44 +296,18 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
 	dup2(fd, STDIN_FILENO);
 	dup2(fd, STDOUT_FILENO);
 	dup2(fd, STDERR_FILENO);
-	close(fd);
 
-	/*
-	 * Become session leader and set controlling TTY
-	 * to enable Ctrl-C and job control in shell.
-	 */
-	setsid();
-	if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) < 0)
-		logit(LOG_WARNING, "Failed TIOCSCTTY on %s: %s", tty, strerror(errno));
+	/* Set default TERM, run_getty() below allows override */
+	if (ioctl(fd, VT_OPENQRY, &dummy) == -1)
+		setenv("TERM", "vt102", 1); /* likely a serial line */
+	else
+		setenv("TERM", "linux", 1);
 
 	/*
 	 * Reset to sane defaults in case of messup from prev. session
 	 */
-	stty(STDIN_FILENO, speed);
-
-	/*
-	 * Disable ISIG (INTR, QUIT, SUSP) before handing over to getty.
-	 * It is up to the getty process to allow them again.
-	 */
-	if (!tcgetattr(STDIN_FILENO, &term)) {
-		term.c_lflag    &= ~ISIG;
-		term.c_cc[VEOF]  = _POSIX_VDISABLE;
-		term.c_cc[VINTR] = _POSIX_VDISABLE;
-		tcsetattr(STDIN_FILENO, TCSAFLUSH, &term);
-	}
-
-	/* Reset signal handlers that were set by the parent process */
-	sig_unblock();
-
-	/*
-	 * Ignore a few signals, needed to prevent Ctrl-C at login:
-	 * prompt and to prevent QUIT from dumping core.
-	 */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags   = SA_RESTART;
-	sa.sa_handler = SIG_IGN;
-	sigaction(SIGINT,  &sa, NULL);
-	sigaction(SIGQUIT, &sa, NULL);
+	stty(fd, speed);
+	close(fd);
 
 	/* Set configured limits */
 	for (int i = 0; i < RLIMIT_NLIMITS; i++) {
@@ -309,8 +325,12 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
 
 static int activate_console(int noclear, int nowait)
 {
+	static const char msg[] = "\nPlease press Enter to activate this console.";
+	static const char clr[] = "\r\e[K";
+	static const char cup[] = "\e[A";
 	struct termios orig;
-	int ret = 0;
+	char c;
+	int rc;
 
 	if (nowait || rescue)
 		return 1;
@@ -329,36 +349,24 @@ static int activate_console(int noclear, int nowait)
 		tcsetattr(STDIN_FILENO, TCSAFLUSH, &c);
 	}
 
-	while (!fexist(SYNC_SHUTDOWN)) {
-		char c;
-		static const char clr[] = "\r\e[2K";
-		static const char cup[] = "\e[A";
-		static const char msg[] = "\nPlease press Enter to activate this console.";
+	dprint(STDERR_FILENO, clr, strlen(clr));
+	dprint(STDERR_FILENO, msg, strlen(msg));
+	while ((rc = read(STDIN_FILENO, &c, 1)) > 0 && c != '\r' && c != '\n')
+		continue;
 
-		if (fexist(SYNC_STOPPED)) {
-			sleep(5);
-			continue;
-		}
+	/* On any error (likely EINTR), we avoid starting getty */
+	if (rc == -1)
+		rc = 0;
 
-		dprint(STDERR_FILENO, clr, strlen(clr));
-		dprint(STDERR_FILENO, msg, strlen(msg));
-		while (read(STDIN_FILENO, &c, 1) == 1 && c != '\r')
-			continue;
-
-		if (fexist(SYNC_STOPPED))
-			continue;
-
-		dprint(STDERR_FILENO, clr, strlen(clr));
-		dprint(STDERR_FILENO, cup, strlen(cup));
-		ret = 1;
-		break;
-	}
+	/* Clear msg and move cursor up for next message/login: */
+	dprint(STDERR_FILENO, clr, strlen(clr));
+	dprint(STDERR_FILENO, cup, strlen(cup));
 
 	/* Restore TTY */
 	if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &orig) == -1)
-		ret = 0;
+		rc = 0;		/* TTY in bad shape, restart */
 
-	return ret;
+	return rc;
 }
 
 /*
@@ -380,32 +388,14 @@ static int activate_console(int noclear, int nowait)
  * since /bin/login usually only disables ECHO until a password line has
  * been entered.  Upon starting the user's $SHELL the ISIG flag is reset
  */
-pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, struct rlimit rlimit[])
-{
-	speed_t speed;
-	int rc = 1;
-
-	speed = stty_parse_speed(baud);
-	prepare_tty(tty, speed, "tty", rlimit);
-	if (activate_console(noclear, nowait)) {
-		logit(LOG_INFO, "Starting built-in getty on %s, speed %u", tty, speed);
-		rc = getty(tty, speed, term, NULL);
-	}
-
-	return rc;
-}
-
-/*
- * Start external getty as defined by user in .conf file
- */
-pid_t run_getty2(char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[])
+pid_t run_getty(char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[])
 {
 	int rc = 1;
 
 	/* Dunno speed, tell stty() to not mess with it */
 	prepare_tty(tty, B0, "getty", rlimit);
 	if (activate_console(noclear, nowait)) {
-		logit(LOG_INFO, "Starting external getty on %s", tty);
+		logit(LOG_INFO, "Starting getty on %s", tty);
 		rc = execv(cmd, args);
 	}
 
@@ -414,6 +404,32 @@ pid_t run_getty2(char *tty, char *cmd, char *args[], int noclear, int nowait, st
 	return rc;
 }
 
+int sh(char *tty)
+{
+	char *args[2] = {
+		NULL,
+		NULL
+	};
+	char *arg0;
+	size_t len;
+
+	/* The getty process is usually responsible for the UTMP login record */
+	utmp_set_login(tty, NULL);
+
+	/* Start /bin/sh as a login shell, i.e. with a prefix '-' */
+	len = strlen(_PATH_BSHELL) + 2;
+	arg0 = malloc(len);
+	if (!arg0)
+		err(1, "Failed allocating memory");
+	snprintf(arg0, len, "-%s", _PATH_BSHELL);
+	args[0] = arg0;
+
+	/* Unblock signals inherited from parent */
+	sig_unblock();
+
+	return execv(_PATH_BSHELL, args);
+}
+
 pid_t run_sh(char *tty, int noclear, int nowait, struct rlimit rlimit[])
 {
 	int rc = 1;

src/finit.c

@@ -36,7 +36,11 @@
 #include <sys/mount.h>
 #include <sys/stat.h>		/* umask(), mkdir() */
 #include <sys/wait.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "cgroup.h"
@@ -61,11 +65,13 @@ 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 *sdown     = NULL;
 char *network   = NULL;
 char *hostname  = NULL;
 char *rcsd      = FINIT_RCSD;
 char *runparts  = NULL;
+char *osheading = NULL;
 
 uev_ctx_t *ctx  = NULL;		/* Main loop context */
 svc_t *wdog     = NULL;		/* No watchdog by default */
@@ -81,7 +87,7 @@ static void banner(void)
 	 * similar enabled to start emptying /dev/kmsg, but for
 	 * our progress we want to own the console.
 	 */
-	if (!debug)
+	if (!debug && !kerndebug)
 		klogctl(6, NULL, 0);
 
 	/*
@@ -90,7 +96,14 @@ static void banner(void)
 	 */
 	plugin_run_hooks(HOOK_BANNER);
 
-	print_banner(INIT_HEADING);
+#ifdef INIT_OSHEADING
+	osheading = INIT_OSHEADING;
+	if (osheading) {
+		if (!osheading[0])
+			osheading = release_heading();
+		print_banner(osheading);
+	}
+#endif
 }
 
 /*
@@ -109,6 +122,7 @@ static int fsck(int pass)
 	while ((fs = getfsent())) {
 		char cmd[80];
 		struct stat st;
+		int fsck_rc = 0;
 
 		if (fs->fs_passno != pass)
 			continue;
@@ -126,8 +140,33 @@ static int fsck(int pass)
 			continue;
 		}
 
+#ifdef FSCK_FIX
+		snprintf(cmd, sizeof(cmd), "fsck -yf %s", fs->fs_spec);
+#else
 		snprintf(cmd, sizeof(cmd), "fsck -a %s", fs->fs_spec);
-		rc += run_interactive(cmd, "Checking filesystem %.13s", fs->fs_spec);
+#endif
+		fsck_rc = run_interactive(cmd, "Checking filesystem %.13s", fs->fs_spec);
+		/*
+		 * "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);
+		}
+		rc += fsck_rc;
 	}
 
 	endfsent();
@@ -137,18 +176,51 @@ static int fsck(int pass)
 
 static int fsck_all(void)
 {
-	int pass, rc = 0;
+	int rc = 0;
+#ifndef FAST_BOOT
+	int pass;
 
 	for (pass = 1; pass < 10; pass++) {
 		rc = fsck(pass);
 		if (rc)
 			break;
 	}
-
+#endif
 	return rc;
 }
 
+/* Wrapper for mount(2), logs any errors to stderr */
+static void fs_mount(const char *src, const char *tgt, const char *fstype,
+		     unsigned long flags, const void *data)
+{
+	const char *msg = !fstype ? "MS_MOVE" : "mounting";
+	int rc;
+
+	rc = mount(src, tgt, fstype, flags, data);
+	if (rc && errno != EBUSY)
+		_pe("Failed %s %s on %s", msg, src, tgt);
+}
+
 #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;
@@ -161,8 +233,7 @@ static void fs_remount_root(int fsckerr)
 			break;
 	}
 
-	/* If / is not listed in fstab, or listed as 'ro', leave it alone */
-	if (!fs || !strcmp(fs->fs_type, "ro"))
+	if (fs_readonly_root(fs))
 		goto out;
 
 	if (fsckerr)
@@ -181,8 +252,7 @@ static void fs_remount_root(int fsckerr)
 	 * XXX: Untested, in the initramfs age we should
 	 *      probably use switch_root instead.
 	 */
-	if (mount(SYSROOT, "/", NULL, MS_MOVE, NULL))
-		_pe("Failed %s / MS_MOVE");
+	fs_mount(SYSROOT, "/", NULL, MS_MOVE, NULL);
 }
 #endif	/* SYSROOT */
 
@@ -206,7 +276,7 @@ static void fs_finalize(void)
 	 */
 	if (!fismnt("/dev/shm")) {
 		makedir("/dev/shm", 0777);
-		mount("shm", "/dev/shm", "tmpfs", 0, "mode=0777");
+		fs_mount("shm", "/dev/shm", "tmpfs", 0, "mode=0777");
 	}
 
 	/* Modern systems use /dev/pts */
@@ -224,7 +294,7 @@ static void fs_finalize(void)
 		snprintf(opts, sizeof(opts), "gid=%d,mode=%d,ptmxmode=0666", gid, mode);
 
 		makedir("/dev/pts", 0755);
-		mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC, opts);
+		fs_mount("devpts", "/dev/pts", "devpts", MS_NOSUID | MS_NOEXEC, opts);
 	}
 
 	/*
@@ -237,19 +307,19 @@ static void fs_finalize(void)
 	 * for /run (and optionally /run/lock).
 	 */
 	if (fisdir("/run") && !fismnt("/run")) {
-		mount("tmpfs", "/run", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME, "mode=0755,size=10%");
+		fs_mount("tmpfs", "/run", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME, "mode=0755,size=10%");
 
 		/* This prevents user DoS of /run by filling /run/lock at the expense of another tmpfs, max 5MiB */
 		makedir("/run/lock", 1777);
-		mount("tmpfs", "/run/lock", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME, "mode=0777,size=5252880");
+		fs_mount("tmpfs", "/run/lock", "tmpfs", MS_NOSUID | MS_NODEV | MS_NOEXEC | MS_RELATIME, "mode=0777,size=5252880");
 	}
 
 	/* Modern systems use tmpfs for /tmp */
 	if (!fismnt("/tmp"))
-		mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV, "mode=1777");
+		fs_mount("tmpfs", "/tmp", "tmpfs", MS_NOSUID | MS_NODEV, "mode=1777");
 }
 
-static void fs_mount(void)
+static void fs_mount_all(void)
 {
 	if (!rescue)
 		fs_remount_root(fsck_all());
@@ -263,7 +333,8 @@ static void fs_mount(void)
 	_d("Calling extra mount hook, after mount -a ...");
 	plugin_run_hooks(HOOK_MOUNT_POST);
 
-	run("swapon -ea");
+	if (whichp("swapon"))
+		run_interactive("swapon -ea", "Enabling system swap");
 
 	_d("Finalize, ensure common file systems are available ...");
 	fs_finalize();
@@ -273,9 +344,9 @@ static void fs_mount(void)
  * We need /proc for rs_remount_root() and conf_parse_cmdline(), /dev
  * for early multi-console, and /sys for the cgroups support.  Any
  * occurrence of these file systems in /etc/fstab will replace these
- * mounts later in fs_mount()
+ * mounts later in fs_mount_all()
  *
- * Ignore any mount errors with EBUSY, kernel likely alread mounted
+ * Ignore any mount errors with EBUSY, kernel likely already mounted
  * the filesystem for us automatically, e.g., CONFIG_DEVTMPFS_MOUNT.
  */
 static void fs_init(void)
@@ -293,11 +364,16 @@ static void fs_init(void)
 	umask(022);
 
 	for (i = 0; i < NELEMS(fs); i++) {
-		int rc;
+		/*
+		 * Check if already mounted, we may be running in a
+		 * container, or an initramfs ran before us.  The
+		 * function fismnt() reliles on /proc/mounts being
+		 * unique for each chroot/container.
+		 */
+		if (fismnt(fs[i].file))
+			continue;
 
-		rc = mount(fs[i].spec, fs[i].file, fs[i].type, 0, NULL);
-		if (rc && errno != EBUSY)
-			_pe("Failed mounting %s on %s", fs[i].spec, fs[i].file);
+		fs_mount(fs[i].spec, fs[i].file, fs[i].type, 0, NULL);
 	}
 }
 
@@ -347,7 +423,7 @@ static void finalize(void *unused)
 static void crank_worker(void *unused)
 {
 	/*
-	 * Initalize state machine and start all bootstrap tasks
+	 * Initialize state machine and start all bootstrap tasks
 	 * NOTE: no network available!
 	 */
 	sm_init(&sm);
@@ -484,17 +560,17 @@ static int telinit(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-	struct wq crank = {
+	struct wq crank_work = {
 		.cb = crank_worker,
 		.delay = 10
 	};
-	struct wq bootstrap = {
+	struct wq bootstrap_work = {
 		.cb = bootstrap_worker,
 		.delay = 100
 	};
 	uev_ctx_t loop;
 
-	/* telinit or stand-alone process monitor */
+	/* user calling telinit or init */
 	if (getpid() != 1)
 		return telinit(argc, argv);
 
@@ -505,17 +581,17 @@ 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();
 
 	/*
-	 * Initalize event context.
+	 * Initialize event context.
 	 */
 	uev_init1(&loop, 1);
 	ctx = &loop;
@@ -525,6 +601,8 @@ int main(int argc, char *argv[])
 	 */
 	setenv("PATH", _PATH_STDPATH, 1);
 	setenv("SHELL", _PATH_BSHELL, 1);
+	setenv("LOGNAME", "root", 1);
+	setenv("USER", "root", 1);
 
 	if (chdir("/"))
 		_pe("Failed cd /");
@@ -560,6 +638,11 @@ int main(int argc, char *argv[])
 	enable_progress(1);	/* Allow progress, if enabled */
 	banner();
 
+	if (osheading)
+		logit(LOG_CONSOLE | LOG_NOTICE, "%s, entering runlevel S", osheading);
+	else
+		logit(LOG_CONSOLE | LOG_NOTICE, "Entering runlevel S");
+
 	/*
 	 * Initial setup of signals, ignore all until we're up.
 	 */
@@ -571,13 +654,15 @@ int main(int argc, char *argv[])
 	cgroup_init(&loop);
 
 	/* Check and mount filesystems. */
-	fs_mount();
+	fs_mount_all();
 
 	/* Bootstrap conditions, needed for hooks */
 	cond_init();
 
-	/* Emit conditions for early hooks that ran before the
-	 * condition system was initialized in case anyone . */
+	/*
+	 * Emit conditions for early hooks that ran before the condition
+	 * system was initialized in case anyone.
+	 */
 	cond_set_oneshot(plugin_hook_str(HOOK_BANNER));
 	cond_set_oneshot(plugin_hook_str(HOOK_ROOTFS_UP));
 
@@ -616,10 +701,15 @@ int main(int argc, char *argv[])
 	api_init(&loop);
 
 	_d("Starting the big state machine ...");
-	schedule_work(&crank);
+	schedule_work(&crank_work);
 
 	_d("Starting bootstrap finalize timer ...");
-	schedule_work(&bootstrap);
+	schedule_work(&bootstrap_work);
+
+	/*
+	 * Background service tasks
+	 */
+	service_init();
 
 	/*
 	 * Enter main loop to monitor /dev/initctl and services

src/finit.h

@@ -34,7 +34,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 #include <uev/uev.h>
 
 /* just in case */
@@ -50,8 +54,10 @@
 #define FINIT_CGPATH            "/sys/fs/cgroup"
 #endif
 
+/* To use these, include config.h, or define FINIT_LIBPATH_ */
 #define _PATH_LOGIT             FINIT_LIBPATH_ "/logit"
 #define _PATH_SULOGIN           FINIT_LIBPATH_ "/sulogin"
+#define _PATH_GETTY             FINIT_LIBPATH_ "/getty"
 
 #define CMD_SIZE                256
 #define LINE_SIZE               1024
@@ -89,6 +95,7 @@
 #define INIT_CMD_SVC_QUERY      130
 #define INIT_CMD_SVC_FIND       131
 #define INIT_CMD_SVC_FIND_BYC   132
+#define INIT_CMD_SIGNAL         133
 #define INIT_CMD_NACK           254
 #define INIT_CMD_ACK            255
 
@@ -108,11 +115,13 @@ extern int    debug;
 extern int    rescue;
 extern int    single;
 extern int    bootstrap;
+extern int    kerndebug;
 extern char  *rcsd;
 extern char  *sdown;
 extern char  *network;
 extern char  *hostname;
 extern char  *runparts;
+extern char  *osheading;
 extern uev_ctx_t *ctx;
 
 #endif /* FINIT_H_ */

src/getty.c

@@ -21,42 +21,46 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+
 #include <err.h>
 #include <errno.h>
+#include <limits.h>		/* LOGIN_NAME_MAX */
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <sys/ttydefaults.h>	/* Not included by default in musl libc */
 #include <termios.h>
+#include <unistd.h>		/* sysconf() */
 
 #include "finit.h"
-#include "cgroup.h"
 #include "helpers.h"
-#include "sig.h"
 #include "utmp-api.h"
 
 #ifndef _PATH_LOGIN
 #define _PATH_LOGIN  "/bin/login"
 #endif
 
+#ifndef LOGIN_NAME_MIN
+#define LOGIN_NAME_MIN 64
+#endif
+
+static long logname_len = 32;	/* useradd(1) limit at 32 chars */
+
 /*
  * Read one character from stdin.
  */
-static int readch(char *tty)
+static int readch(void)
 {
-	int st;
 	char ch1;
+	int st;
 
 	st = read(STDIN_FILENO, &ch1, 1);
-	if (st == 0) {
-		dprint(STDOUT_FILENO, "\n", 0);
-		_exit(0);
-	}
-
-	if (st < 0)
-		errx(1, "getty: %s: read error", tty);
+	if (st <= 0)
+		return -1;
 
 	return ch1 & 0xFF;
 }
@@ -141,10 +145,10 @@ static void do_issue(char *tty)
 /*
  * Handle the process of a GETTY.
  */
-static void do_getty(char *tty, char *name, size_t len)
+static int get_logname(char *tty, char *name, size_t len)
 {
-	int ch;
 	char *np;
+	int ch;
 
 	/*
 	 * Display prompt.
@@ -155,14 +159,9 @@ static void do_getty(char *tty, char *name, size_t len)
 		do_issue(tty);
 
 		np = name;
-		while ((ch = readch(tty)) != '\n') {
-			if (ch == CTRL('U')) {
-				while (np > name) {
-					dprint(STDOUT_FILENO, "\b \b", 3);
-					np--;
-				}
-				continue;
-			}
+		while ((ch = readch()) != '\n') {
+			if (ch < 0)
+				return 1;
 
 			if (np < name + len)
 				*np++ = ch;
@@ -174,6 +173,7 @@ static void do_getty(char *tty, char *name, size_t len)
 	}
 
 	name[len - 1] = 0;
+	return 0;
 }
 
 /*
@@ -185,26 +185,28 @@ static int do_login(char *name)
 {
 	struct stat st;
 
-	cgroup_user(name, 0);
 	execl(_PATH_LOGIN, _PATH_LOGIN, name, NULL);
 
 	/*
 	 * Failed to exec login, should not happen on normal systems.
 	 * Try a starting a rescue shell instead.
-	 *
-	 * Note: Add /etc/securetty handling.
 	 */
-	warnx("Failed exec %s, attempting fallback to %s ...", _PATH_LOGIN, _PATH_BSHELL);
-	if (fstat(0, &st) == 0 && S_ISCHR(st.st_mode))
+	if (fstat(0, &st) == 0 && S_ISCHR(st.st_mode)) {
+		warnx("Failed exec %s, attempting fallback to %s ...", _PATH_LOGIN, _PATH_SULOGIN);
+		execl(_PATH_SULOGIN, _PATH_SULOGIN, NULL);
+
+		warnx("Failed exec %s, attempting fallback to %s ...", _PATH_SULOGIN, _PATH_BSHELL);
 		execl(_PATH_BSHELL, _PATH_BSHELL, NULL);
+	}
 
 	return 1;	/* We shouldn't get here ... */
 }
 
-int getty(char *tty, speed_t speed, char *term, char *user)
+static int getty(char *tty, speed_t speed, char *term, char *user)
 {
-	const char cln[] = "\r\e[2K\n";
-	char name[30];
+	const char cln[] = "\r\e[K\n";
+	char name[logname_len + 1]; /* +1 for NUL termination */
+	pid_t sid;
 
 	/*
 	 * Clean up tty name.
@@ -212,59 +214,70 @@ int getty(char *tty, speed_t speed, char *term, char *user)
 	if (!strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)))
 		tty += 5;
 
-	/* Set up TTY, re-enabling ISIG et al. */
-	stty(STDIN_FILENO, speed);
-	dprint(STDERR_FILENO, cln, strlen(cln));
-
 	/* The getty process is responsible for the UTMP login record */
 	utmp_set_login(tty, NULL);
-	if (!user)
-		do_getty(tty, name, sizeof(name));
-	else
+
+	/* Replace "Please press enter ..." with login: */
+	dprint(STDERR_FILENO, cln, strlen(cln));
+
+restart:
+	stty(STDIN_FILENO, speed);
+	if (!user) {
+		if (get_logname(tty, name, sizeof(name)))
+			goto restart;
+	} else
 		strlcpy(name, user, sizeof(name));
 
+	/* check current session associated with our tty */
+	sid = tcgetsid(0);
+	if (sid < 0 || getpid() != sid) {
+		if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) == -1)
+			err(1, "failed stealing controlling TTY");
+	}
+
 	if (term && term[0])
 		setenv("TERM", term, 1);
 
 	return do_login(name);
 }
 
-int sh(char *tty)
+static int usage(int rc)
 {
-	struct termios term;
-	char *args[2] = {
-		NULL,
-		NULL
-	};
-	char *arg0;
-	size_t len;
+	warnx("usage: getty [-h?] tty [speed [term]]");
+	return rc;
+}
 
-	/* The getty process is usually responsible for the UTMP login record */
-	utmp_set_login(tty, NULL);
+int main(int argc, char *argv[])
+{
+	char *tty, *speed = "0", *term = NULL;
+	int c;
 
-	/* Set up TTY, re-enabling ISIG et al. */
-	stty(STDIN_FILENO, B0);
-
-	/* Start /bin/sh as a login shell, i.e. with a prefix '-' */
-	len = strlen(_PATH_BSHELL) + 2;
-	arg0 = malloc(len);
-	if (!arg0)
-		err(1, "Failed allocating memory");
-	snprintf(arg0, len, "-%s", _PATH_BSHELL);
-	args[0] = arg0;
-
-	/* Reenable Ctrl-D and Ctrl-C, and ... */
-	if (!tcgetattr(STDIN_FILENO, &term)) {
-		term.c_lflag    |= ISIG;
-		term.c_cc[VEOF]  = CEOF;
-		term.c_cc[VINTR] = CINTR;
-		tcsetattr(STDIN_FILENO, TCSAFLUSH, &term);
+	while ((c = getopt(argc, argv, "h?")) != EOF) {
+		switch(c) {
+		case 'h':
+		case '?':
+			return usage(0);
+		default:
+			return usage(1);
+		}
 	}
 
-	/* ... unblock signals in general */
-	sig_unblock();
+	if (optind >= argc)
+		return usage(1);
 
-	return execv(_PATH_BSHELL, args);
+	tty = argv[optind++];
+	if (optind < argc)
+		speed = argv[optind++];
+	if (optind < argc)
+		term = argv[optind++];
+
+	logname_len = sysconf(_SC_LOGIN_NAME_MAX);
+	if (logname_len == -1i)
+	       logname_len = LOGIN_NAME_MAX;
+	if (logname_len < LOGIN_NAME_MIN)
+		logname_len = LOGIN_NAME_MIN;
+
+	return getty(tty, atoi(speed), term, NULL);
 }
 
 /**

src/helpers.c

@@ -30,12 +30,18 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <stdarg.h>
+#include <sysexits.h>
 #include <sys/ioctl.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
 #include "private.h"
+#include "sig.h"
 #include "util.h"
 #include "utmp-api.h"
 
@@ -53,7 +59,7 @@ static pstyle_t progress_style = PROGRESS_DEFAULT;
 #define STATUS_CLASS {							\
 	CHOOSE(" OK ",  " OK ",  "\e[1;32m"),		/* Green  */	\
 	CHOOSE("FAIL",  "FAIL",  "\e[1;31m"),		/* Red    */	\
-	CHOOSE("WARN",  "WARN",  "\e[1;31m"),		/* Red    */	\
+	CHOOSE("WARN",  "WARN",  "\e[1;33m"),		/* Yellow */	\
 	CHOOSE(" \\/ ", " ⋯  ", "\e[1;33m"),		/* Yellow */	\
 }
 
@@ -68,93 +74,14 @@ static const char *status2[] = STATUS_CLASS;
 #define CHOOSE(x,y,z) z
 static const char *color[] = STATUS_CLASS;
 
-/*
- * System consoles, can be given multiple times on the kernel cmdline.
- * We support only three currently.  If none are given on the cmdline
- * we probe /sys/class/tty/console/active and use the first (default).
- */
-#define MAX_CONS 3
-
-static char *consoles[MAX_CONS];
-static int fds[MAX_CONS];
-static int num_cons = 0;
-
-/*
- * System default console is always the first
- */
 char *console(void)
 {
-	return consoles[0];
-}
-
-static void add_console(char *cons)
-{
-	char path[80];
-	char *ptr;
-	int i;
-
-	if (num_cons == NELEMS(fds)) {
-		_e("too many consoles, max %d supported", NELEMS(fds));
-		return;
-	}
-
-	/* drop any options */
-	ptr = strchr(cons, ',');
-	if (ptr)
-		*ptr = 0;
-
-	if (!strncmp(cons, "/dev/", 5))
-		cons += 5;
-
-	snprintf(path, sizeof(path), "/dev/%s", cons);
-
-	/* check for and skip duplicates */
-	for (i = 0; i < num_cons; i++) {
-		if (string_compare(path, consoles[i]))
-			return;
-	}
-
-	/* this requires we have /dev mounted && a device there */
-	fds[num_cons] = open(path, O_WRONLY);
-	if (fds[num_cons] < 0) {
-		_pe("Failed opening console %s", path);
-		return;
-	}
-	consoles[num_cons] = strdup(path);
-	num_cons++;
-}
-
-static void find_active_consoles(void)
-{
-	char *cons, *ptr, *tok;
-	char buf[512];
-	FILE *fp;
-
-	fp = fopen("/sys/class/tty/console/active", "r");
-	if (!fp) {
-	fallback:
-		_d("Using fallback /dev/console");
-		add_console("console");
-		return;
-	}
-
-	ptr = fgets(buf, sizeof(buf), fp);
-	fclose(fp);
-	if (!ptr)
-		goto fallback;
-
-	cons = chomp(ptr);
-	_d("Using these system consoles: %s", cons);
-	while ((tok = strtok(cons, " \t"))) {
-		cons = NULL;
-		add_console(tok);
-	}
+	return _PATH_CONSOLE;
 }
 
 void console_init(void)
 {
-	find_active_consoles();
-	ttinit();
+	log_init();
 }
 
 ssize_t cprintf(const char *fmt, ...)
@@ -163,14 +90,12 @@ ssize_t cprintf(const char *fmt, ...)
 	char buf[len < 256 ? 256 : len];
 	size_t size;
 	va_list ap;
-	int i;
 
 	va_start(ap, fmt);
 	size = vsnprintf(buf, sizeof(buf), fmt, ap);
 	va_end(ap);
 
-	for (i = 0; i < num_cons; i++)
-		dprint(fds[i], buf, size);
+	dprint(STDERR_FILENO, buf, size);
 
 	return size;
 }
@@ -205,6 +130,49 @@ void show_progress(pstyle_t style)
 	progress_onoff = style;
 }
 
+/*
+ * Find PRETTY_NAME in /etc/os-release to use as heading at boot
+ * and on runlevel changes.  Fallback: "Finit vX.YY"
+ */
+char *release_heading(void)
+{
+	char *name = NULL;
+	char buf[256];
+	FILE *fp;
+
+	fp = fopen("/etc/os-release", "r");
+	if (fp) {
+		while (fgets(buf, sizeof(buf), fp)) {
+			char *ptr = &buf[12];
+
+			if (strncmp(buf, "PRETTY_NAME=", 12))
+				continue;
+
+			if (*ptr == '"' || *ptr == '\'') {
+				char *end = &ptr[strlen(ptr) - 1];
+				char q = *ptr;
+
+				while (end > ptr && isspace(*end))
+					*end-- = 0;
+
+				if (*end == q) {
+					*end = 0;
+					ptr++;
+				}
+			}
+
+			name = strdup(ptr);
+			break;
+		}
+		fclose(fp);
+	}
+
+	if (!name)
+		name = strdup(PACKAGE_NAME " v" PACKAGE_VERSION);
+
+	return name;
+}
+
 /*
  * Return screen length of string, not counting escape chars, and
  * accounting for unicode characters as only one screen byte wide
@@ -261,7 +229,7 @@ void print_banner(const char *heading)
 		return;
 
 	buf[0] = 0;
-	strlcat(buf, "\r\e[2K", sizeof(buf));
+	strlcat(buf, "\r\e[K", sizeof(buf));
 
 	if (progress_style == PROGRESS_CLASSIC) {
 		strlcat(buf, "\e[1m", sizeof(buf));
@@ -346,7 +314,7 @@ void printv(const char *fmt, va_list ap)
 	if (progress_style == PROGRESS_CLASSIC)
 		cprintf("\r%s ", pad(buf, sizeof(buf), ".", sizeof(buf)));
 	else
-		cprintf("\r\e[2K%s%s", status(3), buf);
+		cprintf("\r\e[K%s%s", status(3), buf);
 }
 
 void print(int rc, const char *fmt, ...)
@@ -527,27 +495,52 @@ void networking(int updown)
 
 	/* Debian/Ubuntu/Busybox/RH/Suse */
 	if (!whichp("ifup"))
-		goto done;
+		goto fallback;
 
 	if (fexist("/etc/network/interfaces")) {
 		pid_t pid;
 
 		pid = fork();
 		if (pid == 0) {
+			int rc = EX_OSERR;
+			const char *cmd;
+			FILE *pp;
+
+			setsid();
+			sig_unblock();
+
 			if (updown)
-				run("ifup -a");
+				cmd = "ifup -a 2>&1";
+			else if (whichp("ifquery"))
+				/* Regular ifodwn supports --force but not -f */
+				cmd = "ifdown -a --force 2>&1";
 			else
-				run("ifdown -a");
-			_exit(0);
+				/* Busybox ifdown support -f, but not --force */
+				cmd = "ifdown -a -f 2>&1";
+
+			pp = popen(cmd, "r");
+			if (pp) {
+				char buf[256];
+
+				while (fgets(buf, sizeof(buf), pp))
+					logit(LOG_NOTICE, "network: %s", buf);
+
+				rc = pclose(pp);
+			}
+
+			_exit(rc);
 		}
 		cgroup_service("network", pid, NULL);
+		print(pid > 0 ? 0 : 1, "%s network interfaces ...",
+		      updown ? "Bringing up" : "Taking down");
 
-		print(pid > 0 ? 0 : 1, "%s networking", updown ? "Starting" : "Stopping");
+		goto done;
 	}
 
-done:
+fallback:
 	/* Fall back to bring up at least loopback */
 	ifconfig("lo", "127.0.0.1", "255.0.0.0", updown);
+done:
 
 	/* Hooks that rely on loopback, or basic networking being up. */
 	if (updown) {
@@ -556,6 +549,44 @@ done:
 	}
 }
 
+/*
+ * Very basic, and incomplete, check if we're running in a container.
+ */
+int in_container(void)
+{
+	const char *containers[] = {
+		"lxc",
+		"docker",
+		"kubepod",
+		"unshare"
+	};
+	const char *files[] = {
+		"/run/.containerenv",
+		"/.dockerenv"
+	};
+	static int incont = -1;
+	size_t i;
+	char *c;
+
+	if (incont > 0)
+		return incont;
+
+	c = getenv("container");
+	if (c) {
+		for (i = 0; i < NELEMS(containers); i++) {
+			if (!strcmp(containers[i], c))
+				return incont = 1;
+		}
+	}
+
+	for (i = 0; i < NELEMS(files); i++) {
+		if (!access(files[i], F_OK))
+			return incont = 1;
+	}
+
+	return 0;
+}
+
 #ifndef HAVE_GETFSENT
 static lfile_t *fstab = NULL;
 
@@ -598,55 +629,6 @@ void endfsent(void)
 }
 #endif	/* HAVE_GETFSENT */
 
-static int hasopt(char *opts, char *opt)
-{
-	char buf[strlen(opts) + 1];
-	char *ptr;
-
-	memcpy(buf, opts, sizeof(buf));
-	ptr = strtok(buf, ",");
-	while (ptr) {
-		if (!strcmp(ptr, opt))
-			return 1;
-
-		ptr = strtok(NULL, ",");
-	}
-
-	return 0;
-}
-
-int ismnt(char *file, char *dir, char *mode)
-{
-	struct mntent *mnt;
-	int found = 0;
-	FILE *fp;
-
-	fp = setmntent(file, "r");
-	if (!fp)
-		return 0;	/* Dunno, maybe not */
-
-	while ((mnt = getmntent(fp))) {
-		if (!strcmp(mnt->mnt_dir, dir)) {
-			if (mode) {
-				if (hasopt(mnt->mnt_opts, mode))
-					found = 1;
-			} else
-				found = 1;
-
-			break;
-		}
-	}
-	endmntent(fp);
-
-	return found;
-}
-
-/* Requires /proc to be mounted */
-int fismnt(char *dir)
-{
-	return ismnt("/proc/mounts", dir, NULL);
-}
-
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/helpers.h

@@ -32,7 +32,11 @@
 #include <sys/types.h>
 #include <sys/ttydefaults.h>	/* Not included by default in musl libc */
 #include <termios.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 #include "log.h"
 
 #define PROGRESS_DEFAULT PROGRESS_MODERN
@@ -61,22 +65,21 @@ struct fstab *getfsent  (void);
 
 char   *console         (void);
 void    console_init    (void);
-ssize_t cprintf         (const char *fmt, ...);
+ssize_t cprintf         (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
 char   *strip_line      (char *line);
 
 void    enable_progress (int onoff);
 void    show_progress   (pstyle_t style);
 
-int     getty           (char *tty, speed_t speed, char *term, char *user);
-int     sh              (char *tty);
+char   *release_heading (void);
 
-void    stty            (int fd, speed_t speed);
 speed_t stty_parse_speed(char *baud);
+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);
 
@@ -90,13 +93,13 @@ int     mksubsys        (const char *dir, mode_t mode, char *user, char *group);
 
 void    set_hostname    (char **hostname);
 void    networking      (int updown);
+int     in_container    (void);
 
 int     complete        (char *cmd, int pid);
-int     run             (char *cmd);
-int     run_interactive (char *cmd, char *fmt, ...);
+int     run             (char *cmd, char *log);
+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 *baud, char *term,  int noclear, int nowait, struct rlimit rlimit[]);
-pid_t   run_getty2      (char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[]);
+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[]);
 int     run_parts       (char *dir, char *cmd);
 
@@ -128,9 +131,6 @@ static inline int dprint(int fd, const char *s, size_t len)
 	return rc;
 }
 
-int	ismnt		(char *file, char *dir, char *mode);
-int	fismnt		(char *dir);
-
 #endif /* FINIT_HELPERS_H_ */
 
 /**

src/initctl.c

@@ -33,7 +33,11 @@
 #include <time.h>
 #include <utmp.h>
 #include <arpa/inet.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "client.h"
 #include "cond.h"
@@ -41,11 +45,14 @@
 #include "service.h"
 #include "cgutil.h"
 #include "util.h"
+#include "utmp-api.h"
 
 struct cmd {
 	char        *cmd;
 	struct cmd  *ctx;
 	int        (*cb)(char *arg);
+	int         *cond;
+	int        (*cb_multiarg)(int argc, char **argv);
 };
 
 int icreate  = 0;
@@ -57,6 +64,9 @@ int verbose  = 0;
 int plain    = 0;
 int quiet    = 0;
 int runlevel = 0;
+int cgrp     = 0;
+int utmp     = 0;
+
 int iw, pw;
 
 extern int reboot_main(int argc, char *argv[]);
@@ -151,8 +161,11 @@ static int do_log(char *svc)
 	if (!svc || !svc[0])
 		svc = "finit";
 
-	if (!fexist(logfile))
+	if (!fexist(logfile)) {
 		logfile = "/var/log/messages";
+		if (!fexist(logfile))
+			return 0; /* bail out, maybe in container */
+	}
 
 	return systemf("cat %s | grep %s | tail -10", logfile, svc);
 }
@@ -166,11 +179,11 @@ static int do_runlevel(char *arg)
 
 	if (!arg) {
 		int prevlevel = 0;
-		int runlevel;
+		int currlevel;
 		char prev;
 
-		runlevel = runlevel_get(&prevlevel);
-		if (255 == runlevel) {
+		currlevel = runlevel_get(&prevlevel);
+		if (255 == currlevel) {
 			printf("unknown\n");
 			return 0;
 		}
@@ -179,7 +192,7 @@ static int do_runlevel(char *arg)
 		if (prev <= '0' || prev > '9')
 			prev = 'N';
 
-		printf("%c %d\n", prev , runlevel);
+		printf("%c %d\n", prev , currlevel);
 		return 0;
 	}
 
@@ -266,6 +279,61 @@ static int do_restart(char *arg)
 	return do_startstop(INIT_CMD_RESTART_SVC, arg);
 }
 
+/**
+ * do_signal - Ask finit to send a signal to a service.
+ * @argv: must point to an array of strings, containing a service
+ *        and signal name, in that order.
+ * @argc: must be 2.
+ *
+ * A signal can be a complete signal name such as "SIGHUP", or
+ * it can be the shortest unique name, such as "HUP" (no SIG prefix).
+ * It can also be a raw signal number, such as "9" (SIGKILL).
+ */
+int do_signal(int argc, char *argv[])
+{
+	struct init_request rq = {
+		.magic = INIT_MAGIC,
+		.cmd   = INIT_CMD_SVC_QUERY
+	};
+	int signo;
+
+	if (argc != 2)
+		errx(1, "invalid number of arguments to signal");
+
+	/* Validate service name */
+	strlcpy(rq.data, argv[0], sizeof(rq.data));
+	if (client_send(&rq, sizeof(rq))) {
+		fprintf(stderr, "No such task or service(s): %s\n\n", argv[0]);
+		goto show_usage;
+	}
+
+	/* Validate signal name (or number) */
+	signo = str2sig(argv[1]);
+	if (signo == -1) {
+		/* Not a signal name, is it an actual signal number? */
+		errno = 0;
+		signo = (int)strtol(argv[1], NULL, 10);
+
+		/* Was it a number? Was it a signo that finit recognizes? */
+		if (errno || !*(sig2str(signo))) {
+			fprintf(stderr, "Not a valid signal (or signo): %s\n", argv[1]);
+			goto show_usage;
+		}
+	}
+
+	/* Reuse runlevel for signal number. */
+	rq.magic    = INIT_MAGIC;
+	rq.cmd      = INIT_CMD_SIGNAL;
+	rq.runlevel = signo;
+	strlcpy(rq.data, argv[0], sizeof(rq.data));
+
+	return client_send(&rq, sizeof(rq));
+
+show_usage:
+	fprintf(stderr, "Usage: initctl signal <NAME>[:ID] <S>\n");
+	return 1;
+}
+
 static int dump_one_cond(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf)
 {
 	const char *cond, *asserted;
@@ -283,7 +351,7 @@ static int dump_one_cond(const char *fpath, const struct stat *sb, int tflag, st
 	if (strncmp("pid/", cond, 4) == 0) {
 		svc_t *svc;
 
-		svc= client_svc_find_by_cond(cond);
+		svc = client_svc_find_by_cond(cond);
 		if (!svc) {
 			nm  = "unknown";
 			pid = 0;
@@ -467,15 +535,12 @@ int do_suspend (char *arg) { return do_cmd(INIT_CMD_SUSPEND);  }
 
 int utmp_show(char *file)
 {
-	static int once = 0;
-	struct tm *sectm;
 	struct utmp *ut;
 	time_t sec;
 
-	int pid;
-	char id[sizeof(ut->ut_id) + 1], user[sizeof(ut->ut_user) + 1], when[80];
-
 	if (heading) {
+		static int once = 0;
+
 		print_header("%s%s ", once ? "\n" : "", file);
 		once++;
 	}
@@ -483,7 +548,12 @@ int utmp_show(char *file)
 
 	setutent();
 	while ((ut = getutent())) {
+		char user[sizeof(ut->ut_user) + 1];
+		char id[sizeof(ut->ut_id) + 1];
+		struct tm *sectm;
+		char when[80];
 		char addr[64];
+		int pid;
 
 		strlcpy(id, ut->ut_id, sizeof(id));
 		strlcpy(user, ut->ut_user, sizeof(user));
@@ -508,7 +578,7 @@ int utmp_show(char *file)
 
 static int do_utmp(char *file)
 {
-	if (!has_utmp())
+	if (!utmp)
 		return 1;
 
 	if (fexist(file))
@@ -537,7 +607,7 @@ static int show_version(char *arg)
  * Pointer to string on the form [2345], may be up to 12 chars long,
  * plus escape sequences for highlighting current runlevel.
  */
-char *runlevel_string(int runlevel, int levels)
+char *runlevel_string(int currlevel, int levels)
 {
 	int i, pos = 1;
 	static char lvl[21];
@@ -547,7 +617,7 @@ char *runlevel_string(int runlevel, int levels)
 
 	for (i = 0; i < 10; i++) {
 		if (ISSET(levels, i)) {
-			if (!plain && runlevel == i)
+			if (!plain && currlevel == i)
 				pos = strlcat(lvl, "\e[1m", sizeof(lvl));
 
 			if (i == 0)
@@ -555,7 +625,7 @@ char *runlevel_string(int runlevel, int levels)
 			else
 				lvl[pos++] = '0' + i;
 
-			if (!plain && runlevel == i)
+			if (!plain && currlevel == i)
 				pos = strlcat(lvl, "\e[0m", sizeof(lvl));
 		} else {
 			lvl[pos++] = '-';
@@ -698,28 +768,47 @@ static int show_status(char *arg)
 {
 	char ident[MAX_IDENT_LEN];
 	char buf[512];
+	int num = 0;
 	svc_t *svc;
 
 	runlevel = runlevel_get(NULL);
 
-	if (arg && arg[0]) {
+	while (arg && arg[0]) {
 		long now = jiffies();
 		char uptm[42] = "N/A";
-		char grbuf[128];
-		char path[256];
-		struct cg *cg;
-		char *group;
+		char *pidfn = NULL;
+		int exact = 0;
+
+		for (svc = client_svc_iterator(1); svc; svc = client_svc_iterator(0)) {
+			svc_ident(svc, ident, sizeof(ident));
+			if (string_compare(ident, arg))
+				num++;
+			if (string_case_compare(ident, arg))
+				exact++;
+		}
+
+		if (num > 1 && !exact)
+			break;
 
 		svc = client_svc_find(arg);
 		if (!svc)
 			return 255;
 
-		if (quiet)
-			return svc->state != SVC_RUNNING_STATE;
+		if (quiet) {
+			if (svc_is_runtask(svc))
+				if (svc->started)
+					return 0;
+				else
+					return 1;
+			else
+				return svc->state != SVC_RUNNING_STATE;
+		}
 
-		group = pid_cgroup(svc->pid, grbuf, sizeof(grbuf));
-		snprintf(path, sizeof(path), "%s/%s", FINIT_CGPATH, group);
-		cg = cg_conf(path);
+		pidfn = svc->pidfile;
+		if (pidfn[0] == '!')
+			pidfn++;
+		else if (pidfn[0] == 0)
+			pidfn = "none";
 
 		printf("     Status : %s\n", status(svc, 1));
 		printf("   Identity : %s\n", svc_ident(svc, ident, sizeof(ident)));
@@ -728,19 +817,32 @@ static int show_status(char *arg)
 		printf("Environment : %s\n", svc_environ(svc, buf, sizeof(buf)));
 		printf("Condition(s): %s\n", svc_cond(svc, buf, sizeof(buf)));
 		printf("    Command : %s\n", svc_command(svc, buf, sizeof(buf)));
-		printf("   PID file : %s\n", svc->pidfile);
+		printf("   PID file : %s\n", pidfn);
 		printf("        PID : %d\n", svc->pid);
 		printf("       User : %s\n", svc->username);
 		printf("      Group : %s\n", svc->group);
 		printf("     Uptime : %s\n", svc->pid ? uptime(now - svc->start_time, uptm, sizeof(uptm)) : uptm);
+		printf("   Restarts : %d (%d/%d)\n", svc->restart_tot, svc->restart_cnt, svc->restart_max);
 		printf("  Runlevels : %s\n", runlevel_string(runlevel, svc->runlevels));
-		if (svc->pid > 1) {
+		if (cgrp && svc->pid > 1) {
+			char grbuf[128];
+			char path[256];
+			struct cg *cg;
+			char *group;
+
+			group = pid_cgroup(svc->pid, grbuf, sizeof(grbuf));
+			if (!group)
+				goto no_cgroup; /* ... or PID doesn't exist (anymore) */
+			snprintf(path, sizeof(path), "%s/%s", FINIT_CGPATH, group);
+			cg = cg_conf(path);
+
 			printf("     Memory : %s\n", memsz(cgroup_memory(group), uptm, sizeof(uptm)));
 			printf("     CGroup : %s cpu %s [%s, %s] mem [%s, %s]\n",
 			       group, cg->cg_cpu.set, cg->cg_cpu.weight, cg->cg_cpu.max,
 			       cg->cg_mem.min, cg->cg_mem.max);
 			show_cgroup_tree(group, "              ");
 		}
+	no_cgroup:
 		printf("\n");
 
 		return do_log(svc->cmd);
@@ -763,9 +865,11 @@ static int show_status(char *arg)
 	for (svc = client_svc_iterator(1); svc; svc = client_svc_iterator(0)) {
 		char *lvls;
 
-		printf("%-*d  ", pw, svc->pid);
-
 		svc_ident(svc, ident, sizeof(ident));
+		if (num && !string_compare(ident, arg))
+			continue;
+
+		printf("%-*d  ", pw, svc->pid);
 		printf("%-*s  %s ", iw, ident, status(svc, 0));
 
 		lvls = runlevel_string(runlevel, svc->runlevels);
@@ -783,6 +887,30 @@ static int show_status(char *arg)
 	return 0;
 }
 
+static int show_ident(char *arg)
+{
+	svc_t *svc;
+
+	for (svc = client_svc_iterator(1); svc; svc = client_svc_iterator(0)) {
+		char ident[MAX_IDENT_LEN];
+		size_t len;
+		char *pos;
+
+		svc_ident(svc, ident, sizeof(ident));
+		pos = strchr(ident, ':');
+		if (pos)
+			len = pos - ident;
+		else
+			len = strlen(ident);
+		if (arg && arg[0] && strncasecmp(ident, arg, len))
+			continue;
+
+		puts(ident);
+	}
+
+	return 0;
+}
+
 static int transform(char *nm)
 {
 	char *names[] = {
@@ -832,12 +960,13 @@ static int usage(int rc)
 		"  -q, --quiet               Silent, only return status of command\n"
 		"  -t, --no-heading          Skip table headings\n"
 		"  -v, --verbose             Verbose output\n"
+		"  -V, --version             Show program version\n"
 		"  -h, --help                This help text\n"
 		"\n"
 		"Commands:\n"
 		"  debug                     Toggle Finit (daemon) debug\n"
 		"  help                      This help text\n"
-		"  version                   Show Finit version\n"
+		"  version                   Show program version\n"
 		"\n", prognm);
 
 	if (has_rcsd)
@@ -861,10 +990,10 @@ static int usage(int rc)
 			"  disable  <CONF>           Disable  .conf in %s\n", ena);
 	if (has_rcsd)
 		fprintf(stderr,
-			"  reload                    Reload  *.conf in " FINIT_RCSD " (activate changes)\n");
+			"  reload                    Reload   *.conf in " FINIT_RCSD " (activate changes)\n");
 	else
 		fprintf(stderr,
-			"  reload                    Reload " FINIT_CONF " (activate changes)\n");
+			"  reload                    Reload   " FINIT_CONF " (activate changes)\n");
 
 	fprintf(stderr,
 //		"  reload   <NAME>[:ID]      Reload (SIGHUP) service by name\n"  
@@ -879,12 +1008,17 @@ static int usage(int rc)
 		"  stop     <NAME>[:ID]      Stop/Pause a running service by name\n"
 		"  reload   <NAME>[:ID]      Reload service by name (SIGHUP or restart)\n"
 		"  restart  <NAME>[:ID]      Restart (stop/start) service by name\n"
+		"  signal   <NAME>[:ID] <S>  Send signal S to service by name, with optional ID\n"
+		"  ident    [NAME]           Show matching identities for NAME, or all\n"
 		"  status   <NAME>[:ID]      Show service status, by name\n"
-		"  status                    Show status of services, default command\n"
-		"\n"
-		"  cgroup                    List cgroup config overview\n"
-		"  ps                        List processes based on cgroups\n"
-		"  top                       Show top-like listing based on cgroups\n"
+		"  status                    Show status of services, default command\n");
+	if (cgrp)
+		fprintf(stderr,
+			"\n"
+			"  cgroup                    List cgroup config overview\n"
+			"  ps                        List processes based on cgroups\n"
+			"  top                       Show top-like listing based on cgroups\n");
+	fprintf(stderr,
 		"\n"
 		"  runlevel [0-9]            Show or set runlevel: 0 halt, 6 reboot\n"
 		"  reboot                    Reboot system\n"
@@ -892,13 +1026,11 @@ static int usage(int rc)
 		"  poweroff                  Halt and power off system\n"
 		"  suspend                   Suspend system\n");
 
-	if (has_utmp())
+	if (utmp)
 		fprintf(stderr,
 			"\n"
-			"  utmp     show             Raw dump of UTMP/WTMP db\n"
-			"\n");
-	else
-		fprintf(stderr, "\n");
+			"  utmp     show             Raw dump of UTMP/WTMP db\n");
+	fprintf(stderr, "\n");
 
 	return rc;
 }
@@ -917,17 +1049,31 @@ static int do_help(char *arg)
 	return usage(0);
 }
 
+static int cmd_cond(struct cmd *cmd)
+{
+	if (!cmd || !cmd->cond)
+		return 1;
+
+	return *cmd->cond;
+}
+
 static int cmd_parse(int argc, char *argv[], struct cmd *command)
 {
 	int i, j;
 
 	for (i = 0; argc > 0 && command[i].cmd; i++) {
-		if (!string_match(command[i].cmd, argv[0]))
+		if (!cmd_cond(&command[i]))
+			continue;
+
+		if (!string_compare(command[i].cmd, argv[0]))
 			continue;
 
 		if (command[i].ctx)
 			return cmd_parse(argc - 1, &argv[1], command[i].ctx);
 
+		if (command[i].cb_multiarg)
+			return command[i].cb_multiarg(argc - 1, argv + 1);
+
 		if (command[i].cb) {
 			int rc = 0;
 
@@ -960,61 +1106,68 @@ int main(int argc, char *argv[])
 		{ "quiet",      0, NULL, 'q' },
 		{ "no-heading", 0, NULL, 't' },
 		{ "verbose",    0, NULL, 'v' },
+		{ "version",    0, NULL, 'V' },
 		{ NULL, 0, NULL, 0 }
 	};
 	struct cmd cond[] = {
-		{ "status",   NULL, do_cond_show }, /* default cmd */
-		{ "dump",     NULL, do_cond_dump },
-		{ "set",      NULL, do_cond_set  },
-		{ "clr",      NULL, do_cond_clr  },
-		{ "clear",    NULL, do_cond_clr  },
-		{ NULL, NULL, NULL }
+		{ "status",   NULL, do_cond_show, NULL, NULL }, /* default cmd */
+		{ "dump",     NULL, do_cond_dump, NULL, NULL  },
+		{ "set",      NULL, do_cond_set,  NULL, NULL  },
+		{ "clr",      NULL, do_cond_clr,  NULL, NULL  },
+		{ "clear",    NULL, do_cond_clr,  NULL, NULL  },
+		{ NULL, NULL, NULL, NULL, NULL  }
 	};
 	struct cmd command[] = {
-		{ "status",   NULL, show_status  }, /* default cmd */
+		{ "status",   NULL, show_status,  NULL, NULL  }, /* default cmd */
+		{ "ident",    NULL, show_ident,   NULL, NULL  },
 
-		{ "debug",    NULL, toggle_debug },
-		{ "devel",    NULL, do_devel     },
-		{ "help",     NULL, do_help      },
-		{ "version",  NULL, show_version },
+		{ "debug",    NULL, toggle_debug, NULL, NULL  },
+		{ "devel",    NULL, do_devel,     NULL, NULL  },
+		{ "help",     NULL, do_help,      NULL, NULL  },
+		{ "version",  NULL, show_version, NULL, NULL  },
 
-		{ "list",     NULL, serv_list    },
-		{ "ls",       NULL, serv_list    },
-		{ "enable",   NULL, serv_enable  },
-		{ "disable",  NULL, serv_disable },
-		{ "touch",    NULL, serv_touch   },
-		{ "show",     NULL, serv_show    },
-		{ "edit",     NULL, serv_edit    },
-		{ "create",   NULL, serv_creat   },
-		{ "delete",   NULL, serv_delete  },
-		{ "reload",   NULL, do_reload    },
+		{ "list",     NULL, serv_list,    NULL, NULL  },
+		{ "ls",       NULL, serv_list,    NULL, NULL  },
+		{ "enable",   NULL, serv_enable,  NULL, NULL  },
+		{ "disable",  NULL, serv_disable, NULL, NULL  },
+		{ "touch",    NULL, serv_touch,   NULL, NULL  },
+		{ "show",     NULL, serv_show,    NULL, NULL  },
+		{ "edit",     NULL, serv_edit,    NULL, NULL  },
+		{ "create",   NULL, serv_creat,   NULL, NULL  },
+		{ "delete",   NULL, serv_delete,  NULL, NULL  },
+		{ "reload",   NULL, do_reload,    NULL, NULL  },
 
-		{ "cond",     cond, NULL         },
+		{ "cond",     cond, NULL, NULL, NULL          },
 
-		{ "log",      NULL, do_log       },
-		{ "start",    NULL, do_start     },
-		{ "stop",     NULL, do_stop      },
-		{ "restart",  NULL, do_restart   },
+		{ "log",      NULL, do_log,       NULL, NULL  },
+		{ "start",    NULL, do_start,     NULL, NULL  },
+		{ "stop",     NULL, do_stop,      NULL, NULL  },
+		{ "restart",  NULL, do_restart,   NULL, NULL  },
+		{ "signal",   NULL, NULL,         NULL, do_signal  },
 
-		{ "cgroup",   NULL, show_cgroup  },
-		{ "ps",       NULL, show_cgps    },
-		{ "top",      NULL, show_cgtop   },
+		{ "cgroup",   NULL, show_cgroup, &cgrp, NULL  },
+		{ "ps",       NULL, show_cgps,   &cgrp, NULL  },
+		{ "top",      NULL, show_cgtop,  &cgrp, NULL  },
 
-		{ "runlevel", NULL, do_runlevel  },
-		{ "reboot",   NULL, do_reboot    },
-		{ "halt",     NULL, do_halt      },
-		{ "poweroff", NULL, do_poweroff  },
-		{ "suspend",  NULL, do_suspend   },
+		{ "runlevel", NULL, do_runlevel,  NULL, NULL  },
+		{ "reboot",   NULL, do_reboot,    NULL, NULL  },
+		{ "halt",     NULL, do_halt,      NULL, NULL  },
+		{ "poweroff", NULL, do_poweroff,  NULL, NULL  },
+		{ "suspend",  NULL, do_suspend,   NULL, NULL  },
 
-		{ "utmp",     NULL, do_utmp      },
-		{ NULL, NULL, NULL }
+		{ "utmp",     NULL, do_utmp,     &utmp, NULL  },
+		{ NULL, NULL, NULL, NULL, NULL  }
 	};
 	int interactive = 1, c;
 
 	if (transform(progname(argv[0])))
 		return reboot_main(argc, argv);
 
-	while ((c = getopt_long(argc, argv, "1bcdfh?pqtv", long_options, NULL)) != EOF) {
+	/* Enable functionality depending on system capabilities */
+	cgrp = cgroup_avail();
+	utmp = has_utmp();
+
+	while ((c = getopt_long(argc, argv, "1bcdfh?pqtvV", long_options, NULL)) != EOF) {
 		switch(c) {
 		case '1':
 			ionce = 1;
@@ -1055,23 +1208,15 @@ int main(int argc, char *argv[])
 		case 'v':
 			verbose = 1;
 			break;
+
+		case 'V':
+			return show_version(NULL);
 		}
 	}
 
 	if (interactive)
 		ttinit();
 
-	if (!has_utmp()) {
-		/* system w/o utmp support, disable 'utmp' command */
-		for (c = 0; command[c].cmd; c++) {
-			if (!string_compare(command[c].cmd, "utmp"))
-				continue;
-
-			command[c].cb = NULL;
-			break;
-		}
-	}
-
 	return cmd_parse(argc - optind, &argv[optind], command);
 }
 

src/initctl.h

@@ -34,7 +34,7 @@ extern int heading;			/* initctl -t */
 extern int verbose;			/* initctl -v */
 extern int plain;			/* initctl -p */
 
-extern void print_header(const char *fmt, ...);
+extern void print_header(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
 #endif /* FINIT_INITCTL_H_ */
 

src/iwatch.c

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

src/iwatch.h

@@ -26,7 +26,11 @@
 #define FINIT_IWATCH_H_
 
 #include <stdint.h>
-#include <lite/queue.h>
+#ifdef _LIBITE_LITE
+# include <libite/queue.h>	/* BSD sys/queue.h API */
+#else
+# include <lite/queue.h>	/* BSD sys/queue.h API */
+#endif
 #include <sys/inotify.h>
 
 #ifndef IN_MASK_CREATE

src/keventd.c

@@ -23,6 +23,8 @@
 
 #include <errno.h>
 #include <dirent.h>
+#include <poll.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -30,14 +32,17 @@
 #include <syslog.h>
 #include <unistd.h>
 
-#include <sys/poll.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-#include "lite/lite.h"
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "cond.h"
 #include "pid.h"
@@ -48,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, ...)
@@ -55,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");
 	}
@@ -80,7 +89,7 @@ static void sys_cond(char *cond, int set)
 	}
 }
 
-static int fgetln(char *path, char *buf, size_t len)
+static int fgetline(char *path, char *buf, size_t len)
 {
 	FILE *fp;
 
@@ -155,11 +164,11 @@ static void init(void)
  		char buf[10];
 
 		snprintf(path, sizeof(path), "%s/%s/type", _PATH_SYSFS_PWR, nm);
-		if (!fgetln(path, buf, sizeof(buf)) && is_ac(buf)) {
+		if (!fgetline(path, buf, sizeof(buf)) && is_ac(buf)) {
 			num_ac++;
 
 			snprintf(path, sizeof(path), "%s/%s/online", _PATH_SYSFS_PWR, nm);
-			if (!fgetln(path, buf, sizeof(buf))) {
+			if (!fgetline(path, buf, sizeof(buf))) {
 				if (check_online(buf))
 					num_ac_online++;
 			}
@@ -175,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
@@ -194,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;
@@ -212,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) {
@@ -227,9 +266,11 @@ int main(int argc, char *argv[])
 				continue;
 			default:
 				panic("unhandled");
-				break;
+				continue;
 			}
 		}
+		buf[len] = 0;
+		logit(LOG_DEBUG, "%s", buf);
 
 		/* skip libusb events, focus on kernel events/changes */
 		if (strncmp(buf, "change@", 7))

src/log.c

@@ -24,7 +24,11 @@
 #include "config.h"
 #include <stdio.h>
 #include <stdarg.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
 #include "helpers.h"
@@ -32,14 +36,16 @@
 #include "util.h"
 
 static int up       = 0;
-static int loglevel = LOG_NOTICE;
+static int loglevel = LOG_INFO;
 
-void log_init(int dbg)
+void log_init(void)
 {
+	ttinit();
+
 	if (debug)
 		loglevel = LOG_DEBUG;
 	else
-		loglevel = LOG_NOTICE;
+		loglevel = LOG_INFO;
 }
 
 /* If we enabled terse mode at boot, restore to previous setting at shutdown */
@@ -55,18 +61,29 @@ void log_exit(void)
 	enable_progress(1);
 }
 
-static void log_open(void)
+static int log_open(void)
 {
-	int opts = LOG_PID;
+	int opts;
 
-	closelog();
+	if (up)
+		return 1;
+	if (access("/dev/log", W_OK))
+		return 0;
 
+	opts = LOG_CONS | LOG_PID;
 	if (debug)
-		opts |= LOG_PERROR; /* LOG_CONS | */
+		opts |= LOG_PERROR;
+
 	openlog("finit", opts, LOG_DAEMON);
 	setlogmask(LOG_UPTO(loglevel));
 
-	up = 1;
+	return up = 1;
+}
+
+static void log_close(void)
+{
+	closelog();
+	up = 0;
 }
 
 /* Toggle debug mode */
@@ -74,12 +91,8 @@ 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");
@@ -91,25 +104,22 @@ void log_debug(void)
  */
 void logit(int prio, const char *fmt, ...)
 {
-	FILE *fp;
 	va_list ap;
+	FILE *fp;
 
 	va_start(ap, fmt);
 
-	if (up || fexist("/dev/log")) {
-		if (!up)
-			log_open();
-
+	if (up || log_open()) {
 		vsyslog(prio, fmt, ap);
 		goto done;
 	}
 
-	if (prio > loglevel)
+	if (LOG_PRI(prio) > loglevel)
 		goto done;
 
-	fp = fopen("/dev/kmsg", "w");
-	if (!fp) {
+	if (in_container() || !(fp = fopen("/dev/kmsg", "w"))) {
 		vfprintf(stderr, fmt, ap);
+		fputs("\n", stderr);
 		goto done;
 	}
 
@@ -121,6 +131,7 @@ void logit(int prio, const char *fmt, ...)
 		va_end(ap);
 		va_start(ap, fmt);
 		vfprintf(stderr, fmt, ap);
+		fputs("\n", stderr);
 	}
 
 done:

src/log.h

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

src/logit.c

@@ -30,7 +30,11 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 static const char version_info[] = PACKAGE_NAME " v" PACKAGE_VERSION;
 extern int logrotate(char *file, int num, off_t sz);
@@ -98,29 +102,38 @@ static int logit(int level, char *buf, size_t len)
 
 static int parse_prio(char *arg, int *f, int *l)
 {
-	char *ptr;
+	char *duparg = strdup(arg);
+	char *ptr, *prio;
 
-	ptr = strchr(arg, '.');
+	if (!duparg)
+		prio = arg;
+	else
+		prio = duparg;
+
+	ptr = strchr(prio, '.');
 	if (ptr) {
 		*ptr++ = 0;
 
 		for (int i = 0; facilitynames[i].c_name; i++) {
-			if (!strcmp(facilitynames[i].c_name, arg)) {
+			if (!strcmp(facilitynames[i].c_name, prio)) {
 				*f = facilitynames[i].c_val;
 				break;
 			}
 		}
 
-		arg = ptr;
+		prio = ptr;
 	}
 
 	for (int i = 0; prioritynames[i].c_name; i++) {
-		if (!strcmp(prioritynames[i].c_name, arg)) {
+		if (!strcmp(prioritynames[i].c_name, prio)) {
 			*l = prioritynames[i].c_val;
 			break;
 		}
 	}
 
+	if (duparg != arg)
+		free(duparg);
+
 	return 0;
 }
 

src/logrotate.c

@@ -20,12 +20,16 @@
  * THE SOFTWARE.
  */
 
-#include <lite/lite.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 static int recreate(char *path, mode_t mode, uid_t uid, gid_t gid)
 {

src/mount.c

@@ -21,14 +21,17 @@
  * THE SOFTWARE.
  */
 
+#include <errno.h>
 #include <string.h>
 #include <mntent.h>
 #include <sys/mount.h>
 
+#include "helpers.h"
+
 /*
  * SysV init on Debian/Ubuntu skips these protected mount points
  *
- * It also skips anything below /proc, /sys and /run for good meausre so
+ * It also skips anything below /proc, /sys and /run for good measure so
  * we do the same here.  What we want is a list of non-protected tmpfs
  * and regular filesystems that can be safely unmounted before we do
  * swapoff, and remount / as read-only, respectively.
@@ -36,7 +39,7 @@
 static int is_protected(char *dir)
 {
 	size_t i;
-	char *protected[] = {
+	char *protected_mnts[] = {
 		"/sys", "/proc",
 		"/.dev", "/dev", "/dev/pts", "/dev/shm", "dev/.static/dev", "/dev/vcs",
 		"/run", "/var/run",
@@ -46,8 +49,8 @@ static int is_protected(char *dir)
 		"/proc/", "/sys/", "/run/", NULL
 	};
 
-	for (i = 0; protected[i]; i++) {
-		if (!strcmp(dir, protected[i]))
+	for (i = 0; protected_mnts[i]; i++) {
+		if (!strcmp(dir, protected_mnts[i]))
 			return 1;
 	}
 
@@ -59,46 +62,66 @@ static int is_protected(char *dir)
 	return 0;
 }
 
-static struct mntent *iterator(char *fstab)
+static void iterator_end(FILE **fp)
+{
+	endmntent(*fp);
+	*fp = NULL;
+}
+
+static struct mntent *iterator(char *fstab, FILE **fp)
 {
-	static FILE *fp = NULL;
 	static struct mntent *mnt;
 
-	if (!fp && fstab) {
-		fp = setmntent(fstab, "r");
-		if (!fp)
+	if (!*fp && fstab) {
+		*fp = setmntent(fstab, "r");
+		if (!*fp)
 			return NULL;
 	}
 
-	while ((mnt = getmntent(fp))) {
+	while ((mnt = getmntent(*fp))) {
 		if (is_protected(mnt->mnt_dir))
 			continue;
 
 		return mnt;
 	}
 
-	endmntent(fp);
-	fp = NULL;
-
+	iterator_end(fp);
 	return NULL;
 }
 
+static int unmount(const char *target)
+{
+	int rc;
+
+	rc = umount(target);
+	if (rc && 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"))) {
-		if (!strcmp("tmpfs", mnt->mnt_fsname))
-			umount(mnt->mnt_dir);
+	while ((mnt = iterator("/proc/mounts", &fp))) {
+		if (!strcmp("tmpfs", mnt->mnt_fsname) && !unmount(mnt->mnt_dir))
+			iterator_end(&fp);  /* Restart iteration */
 	}
 }
 
 void unmount_regular(void)
 {
 	struct mntent *mnt;
+	FILE *fp = NULL;
 
-	while ((mnt = iterator("/proc/mounts"))) {
-		umount(mnt->mnt_dir);
+	while ((mnt = iterator("/proc/mounts", &fp))) {
+		if (!unmount(mnt->mnt_dir))
+			iterator_end(&fp);  /* Restart iteration */
 	}
 }
 

src/pid.c

@@ -27,7 +27,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "pid.h"
 #include "svc.h"
@@ -65,10 +69,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");
@@ -109,8 +114,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)
@@ -153,6 +158,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] = '!';
@@ -166,7 +176,7 @@ int pid_file_set(svc_t *svc, char *file, int not)
  * The logic is explained below.  Please note that using the first form
  * of the syntax not only creates and removes the PID file, but it also
  * calls touch to update the mtime on service_restart(), only applicable
- * to processes that accept SIGHUP.  This to ensure dependant services
+ * to processes that accept SIGHUP.  This to ensure dependent services
  * are sent SIGCONT properly on reload, otherwise their condition would
  * never be asserted again after `initctl reload`.
  *
@@ -195,8 +205,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] == '/')

src/plugin.c

@@ -26,8 +26,13 @@
 #include <dirent.h>		/* readdir() et al */
 #include <poll.h>
 #include <string.h>
-#include <lite/lite.h>
-#include <lite/queue.h>		/* BSD sys/queue.h API */
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+# include <libite/queue.h>	/* BSD sys/queue.h API */
+#else
+# include <lite/lite.h>
+# include <lite/queue.h>	/* BSD sys/queue.h API */
+#endif
 
 #include "config.h"
 #include "cond.h"
@@ -274,7 +279,7 @@ static int init_plugins(uev_ctx_t *ctx)
  * Loads a plugin from @path/@name[.so].  Note, if ".so" is missing from
  * the plugin @name it is added before attempting to load.
  *
- * It is up to the plugin itself ot register itself as a "ctor" with the
+ * It is up to the plugin itself or register itself as a "ctor" with the
  * %PLUGIN_INIT macro so that plugin_register() is called automatically.
  *
  * Returns:

src/plugin.h

@@ -25,7 +25,11 @@
 #define FINIT_PLUGIN_H_
 
 #include <uev/uev.h>
-#include <lite/queue.h>		/* BSD sys/queue.h API */
+#ifdef _LIBITE_LITE
+# include <libite/queue.h>	/* BSD sys/queue.h API */
+#else
+# include <lite/queue.h>	/* BSD sys/queue.h API */
+#endif
 
 #include "svc.h"
 

src/private.h

@@ -28,6 +28,9 @@
 #include "svc.h"
 #include "plugin.h"
 
+#define SERVICE_INTERVAL_DEFAULT 300000 /* 5 mins */
+extern int service_interval;
+
 int       api_init         (uev_ctx_t *ctx);
 int       api_exit         (void);
 

src/reboot.c

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

src/sample.conf

@@ -12,7 +12,7 @@
 # runlevel.  Finit does not restart them when they exit.
 #
 # - run     : wait for completion before continuing with next stanza
-# - task    : like run but started in background, parallell with other stanzas
+# - task    : like run but started in background, parallel with other stanzas
 # - service : supervised daemon, run in foreground, restarted if it crashes
 #
 # The env: is an optional path to a file with environment variables to

src/serv.c

@@ -28,11 +28,30 @@
 #include <glob.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# 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;
@@ -288,6 +307,8 @@ int serv_touch(char *arg)
 	if (!fexist(fn)) {
 		if (!strstr(arg, "finit.conf"))
 			errx(1, "%s not available.", arg);
+		if (is_builtin(arg))
+			errx(1, "%s is a built-in service.", arg);
 
 		strlcpy(path, FINIT_CONF, sizeof(path));
 		fn = path;
@@ -307,6 +328,9 @@ int serv_show(char *arg)
 
 	fn = conf(path, sizeof(path), arg, 0);
 	if (!fexist(fn)) {
+		if (is_builtin(arg))
+			errx(1, "%s is a built-in service.", arg);
+
 		warnx("Cannot find %s", arg);
 		return 1;
 	}
@@ -341,6 +365,9 @@ static int do_edit(char *arg, int creat)
 
 	fn = conf(path, sizeof(path), arg, creat);
 	if (!fexist(fn)) {
+		if (is_builtin(arg))
+			errx(1, "%s is a built-in service.", arg);
+
 		if (!creat) {
 			warnx("Cannot find %s, use -c flag, create command, or select one of:", arg);
 			return serv_list(NULL);
@@ -367,6 +394,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);
@@ -381,6 +409,9 @@ int serv_creat(char *arg)
 	if (!arg || !arg[0])
 		errx(1, "missing argument to create");
 
+	if (is_builtin(arg))
+		errx(1, "%s is a built-in service.", arg);
+
 	/* Input from a pipe or a proper TTY? */
 	if (isatty(STDIN_FILENO))
 		return do_edit(arg, 1);
@@ -416,8 +447,11 @@ int serv_delete(char *arg)
 	}
 
 	fn = conf(buf, sizeof(buf), arg, 0);
-	if (!fn)
+	if (!fn) {
+		if (is_builtin(arg))
+			errx(1, "%s is a built-in service.", arg);
 		errx(1, FINIT_RCSD " missing on system.");
+	}
 
 	if (!fexist(fn))
 		warnx("cannot find %s", fn);

src/service.c

@@ -26,11 +26,16 @@
 
 #include <ctype.h>		/* isblank() */
 #include <string.h>
+#include <sys/reboot.h>
 #include <sys/prctl.h>
 #include <sys/resource.h>
 #include <sys/wait.h>
 #include <net/if.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 #include <wordexp.h>
 
 #include "cgroup.h"
@@ -51,6 +56,7 @@
 static struct wq work = {
 	.cb = service_worker,
 };
+int service_interval = SERVICE_INTERVAL_DEFAULT;
 
 static void svc_set_state(svc_t *svc, svc_state_t new);
 
@@ -138,7 +144,7 @@ static int fredirect(const char *file)
 {
 	int fd;
 
-	fd = open(file, O_WRONLY | O_APPEND);
+	fd = open(file, O_WRONLY | O_APPEND | O_NOCTTY);
 	if (-1 != fd) {
 		dup2(fd, STDOUT_FILENO);
 		dup2(fd, STDERR_FILENO);
@@ -347,8 +353,7 @@ static void source_env(svc_t *svc)
 
 static int is_norespawn(void)
 {
-	return  sig_stopped()            ||
-		fexist("/mnt/norespawn") ||
+	return  fexist("/mnt/norespawn") ||
 		fexist("/tmp/norespawn");
 }
 
@@ -492,6 +497,12 @@ static int service_start(svc_t *svc)
 	/* Declare we're waiting for svc to create its pidfile */
 	svc_starting(svc);
 
+	/* Increment total restarts, unless first time or non-service */
+	if (svc_is_daemon(svc) || svc_is_sysv(svc)) {
+		if (svc->restart_cnt || svc->restart_tot)
+			svc->restart_tot++;
+	}
+
 	/* Block SIGCHLD while forking.  */
 	sigemptyset(&nmask);
 	sigaddset(&nmask, SIGCHLD);
@@ -547,7 +558,7 @@ static int service_start(svc_t *svc)
 
 			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 arg. '%s' too long", svc->cmd, we.we_wordv[i]);
 					rc = WRDE_NOSPACE;
 					goto nomem;
 				}
@@ -560,14 +571,11 @@ static int service_start(svc_t *svc)
 		} else {
 			i = 0;
 			args[i++] = svc->cmd;
+			args[i++] = svc->cmd;
 			args[i++] = "start";
 		}
 		args[i] = NULL;
 
-		if (!svc_is_tty(svc))
-			redirect(svc);
-		sig_unblock();
-
 		/*
 		 * The setsid() call takes care to detach the process
 		 * from its controlling terminal, preventing daemons
@@ -579,7 +587,13 @@ static int service_start(svc_t *svc)
 		 * to the console at boot, for debugging or similar,
 		 * have a look at redirect() and log.console instead.
 		 */
-		setsid();
+		pid = setsid();
+		if (pid < 1)
+			logit(LOG_ERR, "failed setsid(), pid %d: %s", pid, strerror(errno));
+
+		if (!svc_is_tty(svc))
+			redirect(svc);
+		sig_unblock();
 
 		if (svc_is_runtask(svc))
 			status = exec_runtask(args[0], &args[1]);
@@ -615,10 +629,13 @@ static int service_start(svc_t *svc)
 	switch (svc->type) {
 	case SVC_TYPE_RUN:
 		svc->status = complete(svc->cmd, pid);
-		if (WIFEXITED(svc->status) && !WEXITSTATUS(svc->status))
+		if (WIFEXITED(svc->status) && !WEXITSTATUS(svc->status)) {
+			svc->started = 1;
 			result = 0;
-		else
+		} else {
+			svc->started = 0;
 			result = 1;
+		}
 		svc->start_time = svc->pid = 0;
 		svc->once++;
 		svc_set_state(svc, SVC_STOPPING_STATE);
@@ -688,7 +705,7 @@ static void service_cleanup(svc_t *svc)
 		utmp_set_dead(svc->pid); /* Set DEAD_PROCESS UTMP entry */
 
 	svc->oldpid = svc->pid;
-	svc->start_time = svc->pid = 0;
+	svc->starting = svc->start_time = svc->pid = 0;
 }
 
 /**
@@ -700,6 +717,7 @@ static void service_cleanup(svc_t *svc)
  */
 static int service_stop(svc_t *svc)
 {
+	int do_progress = 1;
 	int rc = 0;
 
 	if (!svc)
@@ -722,21 +740,42 @@ static int service_stop(svc_t *svc)
 		logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s stop' ...", svc->cmd);
 	}
 
-	svc_set_state(svc, SVC_STOPPING_STATE);
+	/*
+	 * Make sure we are no longer considering the service to be starting (if
+	 * that was the case). service_monitor() might get confused otherwise, and
+	 * leave the service in a lingering, "stopping", state.
+	 */
+	svc_started(svc);
 
-	if (runlevel != 1)
+	/*
+	 * 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;
+
+	if (runlevel != 1 && do_progress)
 		print_desc("Stopping ", svc->desc);
 
 	if (!svc_is_sysv(svc)) {
 		if (svc->pid > 1) {
 			/* Kill all children in the same proess group, e.g. logit */
 			rc = kill(-svc->pid, svc->sighalt);
-			_d("kill(-%d, %d) => rc %d", svc->pid, svc->sighalt, rc);
+			_d("kill(-%d, %d) => rc %d, errno %d", svc->pid, svc->sighalt, rc, errno);
 			/* PID lost or forking process never really started */
-			if (rc == -1 && ESRCH == errno)
-				service_cleanup(svc);
-		} else
+			if (rc == -1 && (errno == ESRCH || errno == ENOENT)) {
 				service_cleanup(svc);
+				svc_set_state(svc, SVC_HALTED_STATE);
+			} else
+				svc_set_state(svc, SVC_STOPPING_STATE);
+		} else {
+			service_cleanup(svc);
+			svc_set_state(svc, SVC_HALTED_STATE);
+		}
 	} else {
 		char *args[] = { svc->cmd, "stop", NULL };
 		pid_t pid;
@@ -744,6 +783,7 @@ static int service_stop(svc_t *svc)
 		pid = fork();
 		switch (pid) {
 		case 0:
+			setsid();
 			redirect(svc);
 			exec_runtask(svc->cmd, args);
 			_exit(0);
@@ -753,7 +793,7 @@ static int service_stop(svc_t *svc)
 			rc = 1;
 			break;
 		default:
-			rc = WEXITSTATUS(complete(svc->cmd, pid));
+			svc_set_state(svc, SVC_STOPPING_STATE);
 			break;
 		}
 	}
@@ -804,7 +844,7 @@ static int service_restart(svc_t *svc)
 	logit(LOG_CONSOLE | LOG_NOTICE, "Restarting %s[%d], sending SIGHUP ...",
 	      svc_ident(svc, NULL, 0), svc->pid);
 	rc = kill(svc->pid, SIGHUP);
-	if (rc == -1 && errno == ESRCH) {
+	if (rc == -1 && (errno == ESRCH || errno == ENOENT)) {
 		/* nobody home, reset internal state machine */
 		lost = svc->pid;
 	} else {
@@ -830,7 +870,7 @@ static int service_restart(svc_t *svc)
 /**
  * service_reload_dynamic - Called on SIGHUP, 'init q' or 'initctl reload'
  *
- * This function is called when Finit has recieved SIGHUP to reload
+ * This function is called when Finit has received SIGHUP to reload
  * .conf files in /etc/finit.d.  It is responsible for starting,
  * stopping and reloading (forwarding SIGHUP) to processes affected.
  */
@@ -855,7 +895,7 @@ void service_runlevel(int newlevel)
 	sm_set_runlevel(&sm, newlevel);
 	sm_step(&sm);
 
-	if (!rescue && runlevel <= 1)
+	if (!rescue && (runlevel <= 1 || runlevel == 6))
 		networking(0);
 }
 
@@ -891,7 +931,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->cmd, sizeof(svc->env));
 		return;
 	}
 
@@ -915,7 +955,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->cmd, sizeof(svc->cgroup));
 		return;
 	}
 
@@ -951,7 +991,7 @@ 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);
 }
@@ -1066,7 +1106,7 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
  * This function is used to register commands to be run on different
  * system runlevels with optional username.  The @type argument details
  * if it's service to bo monitored/respawned (daemon), a one-shot task
- * or a command that must run in sequence and not in parallell, like
+ * or a command that must run in sequence and not in parallel, like
  * service and task commands do.
  *
  * The @line can optionally start with a username, denoted by an @
@@ -1106,7 +1146,7 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
  *
  * Without the :ID syntax, Finit replaces the first service line with
  * the contents of the second.  The :ID can be any string value and
- * defaults to "" (emtpy string).
+ * defaults to "" (empty string).
  *
  * Returns:
  * POSIX OK(0) on success, or non-zero errno exit status on failure.
@@ -1120,8 +1160,12 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 	char *pre_script = NULL, *post_script = NULL;
 	struct tty tty = { 0 };
 	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;
 	char *line;
 	svc_t *svc;
 
@@ -1177,8 +1221,24 @@ 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))
+			restart_max = atoi(&cmd[8]);
+		else if (!strncasecmp(cmd, "restarttmo:", 11)) /* compat alias */
+			restart_tmo = atoi(&cmd[11]) * 1000;
+		else if (!strncasecmp(cmd, "restart_sec:", 12))
+			restart_tmo = atoi(&cmd[12]) * 1000;
+		else if (!strncasecmp(cmd, "norestart", 9))
+			restart_max = 0;
+		else if (!strncasecmp(cmd, "oncrash:", 8)) {
+			if (!strncasecmp(&cmd[8], "reboot", 6))
+				oncrash_action = SVC_ONCRASH_REBOOT;
+		}
+		else if (!strncasecmp(cmd, "respawn", 7))
+			respawn = 1;
 		else if (!strncasecmp(cmd, "halt:", 5))
 			halt = &cmd[5];
 		else if (!strncasecmp(cmd, "kill:", 5))
@@ -1221,7 +1281,6 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			len += strlen(tty.cmd);
 		else
 			len += 3;
-
 		len += tty.num + 1;
 		for (i = 0; i < tty.num; i++)
 			len += strlen(tty.args[i]) + 1;
@@ -1230,7 +1289,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		if (!line)
 			return errno;
 
-		snprintf(line, len, "%s", tty.cmd ?: "tty");
+		snprintf(line, len, "%s", tty.cmd ? tty.cmd : "tty");
 		for (i = 0; i < tty.num; i++) {
 			strlcat(line, " ", len);
 			strlcat(line, tty.args[i], len);
@@ -1244,6 +1303,9 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 			dev = tty_atcon();
 		else
 			dev = tty.dev;
+
+		/* tty's always respawn, never incr. restart_cnt */
+		respawn = 1;
 	next:
 		svc = svc_find_by_tty(dev);
 	} else
@@ -1259,20 +1321,19 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 
 		if (type == SVC_TYPE_SERVICE && manual)
 			svc_stop(svc);
+
+		svc->restart_max = restart_max;
+		svc->restart_tmo = restart_tmo;
+		svc->oncrash_action = oncrash_action;
 	} else {
 		/* update type, may have changed from service -> task */
 		svc->type = type;
 
 		/* e.g., if missing cmd or env before */
-		svc_unblock(svc);
+		if (!manual)
+			svc_unblock(svc);
 	}
 
-	/* Always clear svc PID file, for now.  See TODO */
-	svc->pidfile[0] = 0;
-	/* Decode any optional pid:/optional/path/to/file.pid */
-	if (pid && svc_is_daemon(svc) && pid_file_parse(svc, pid))
-		_e("Invalid 'pid' argument to service: %s", pid);
-
 	if (username) {
 		char *ptr = strchr(username, ':');
 
@@ -1309,14 +1370,14 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
 		/* TTYs cannot be redirected */
 		log = NULL;
 
-		/* Create name:id tuple for identiy, e.g., tty:S0 */
+		/* Create name:id tuple for identity, e.g., tty:S0 */
 		ptr = strrchr(svc->dev, '/');
-		if (ptr) {
+		if (ptr)
 			ptr++;
-			if (!strncmp(ptr, "tty", 3))
-				ptr += 3;
-		} else
+		else
 			ptr = svc->dev;
+		if (!strncmp(ptr, "tty", 3))
+			ptr += 3;
 		if (!id || id[0] == 0)
 			id = ptr;
 		strlcpy(svc->name, "tty", sizeof(svc->name));
@@ -1350,6 +1411,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));
+	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));
@@ -1402,7 +1483,7 @@ void service_monitor(pid_t lost, int status)
 {
 	svc_t *svc;
 
-	if (fexist(SYNC_SHUTDOWN) || lost <= 1)
+	if (lost <= 1)
 		return;
 
 	svc = svc_find_by_pid(lost);
@@ -1428,8 +1509,10 @@ void service_monitor(pid_t lost, int status)
 	}
 
 	/* Forking sysv/services declare themselves with pid:!/path/to/pid.file  */
-	if (svc_is_starting(svc) && svc_is_forking(svc))
+	if (svc_is_starting(svc) && svc_is_forking(svc)) {
+		svc->pid = 0;	/* Expect no more activity from this one */
 		return;
+	}
 
 	/* Terminate any children in the same proess group, e.g. logit */
 	kill(-svc->pid, SIGKILL);
@@ -1498,6 +1581,33 @@ static void service_kill_script(svc_t *svc)
 	kill(-svc->pid, SIGKILL);
 }
 
+/*
+ * Shared env vars for both pre: and post: scripts
+ */
+static void set_pre_post_envs(svc_t *svc, const char *type)
+{
+	char buf[25 + 256] = "/etc/default:/etc/conf.d";
+	const char *fn = svc_getenv(svc);
+	const char *exist = "0";
+
+	setenv("SERVICE_TYPE", svc_typestr(svc), 1);
+	setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+	setenv("SERVICE_SCRIPT_TYPE", type, 1);
+
+	if (fn) {
+		setenv("SERVICE_ENV_FILE", fn, 1);
+		if (!access(fn, R_OK))
+			exist = "1";
+	}
+	setenv("SERVICE_ENV_FILE_EXIST", exist, 1);
+
+#ifdef FINIT_SYSCONFIG
+	strlcat(buf, ":", sizeof(buf));
+	strlcat(buf, FINIT_SYSCONFIG, sizeof(buf));
+#endif
+	setenv("SERVICE_CONF_DIR", buf, 1);
+}
+
 static void service_pre_script(svc_t *svc)
 {
 	svc->pid = service_fork(svc);
@@ -1514,7 +1624,7 @@ static void service_pre_script(svc_t *svc)
 			NULL
 		};
 
-		setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+		set_pre_post_envs(svc, "pre");
 		execvp(_PATH_BSHELL, argv);
 		_exit(EX_OSERR);
 	}
@@ -1543,7 +1653,7 @@ static void service_post_script(svc_t *svc)
 		rc = WEXITSTATUS(svc->status);
 		sig = WTERMSIG(svc->status);
 
-		setenv("SERVICE_IDENT", svc_ident(svc, NULL, 0), 1);
+		set_pre_post_envs(svc, "post");
 
 		if (WIFEXITED(svc->status)) {
 			char val[4];
@@ -1566,24 +1676,35 @@ static void service_post_script(svc_t *svc)
 
 static void service_retry(svc_t *svc)
 {
-	int timeout;
 	char *restart_cnt = (char *)&svc->restart_cnt;
+	int timeout;
 
 	service_timeout_cancel(svc);
-
-	if (svc->state != SVC_HALTED_STATE ||
-	    svc->block != SVC_BLOCK_RESTARTING) {
-		if (!svc_is_tty(svc))
-			_d("%s not crashing anymore", svc->cmd);
-		*restart_cnt = 0;
+	if (svc->respawn) {
+		_d("%s crashed/exited, respawning ...", svc->cmd);
+		svc_unblock(svc);
+		service_step(svc);
 		return;
 	}
 
-	if (*restart_cnt >= SVC_RESPAWN_MAX) {
+	if (svc->state != SVC_HALTED_STATE ||
+	    svc->block != SVC_BLOCK_RESTARTING) {
+		logit(LOG_CONSOLE | LOG_NOTICE, "Successfully restarted crashing service %s.",
+		      svc_ident(svc, NULL, 0));
+		return;
+	}
+
+	/* Peak instability index */
+	if (*restart_cnt >= svc->restart_max) {
 		logit(LOG_CONSOLE | LOG_WARNING, "Service %s keeps crashing, not restarting.",
 		      svc_ident(svc, NULL, 0));
 		svc_crashing(svc);
 		*restart_cnt = 0;
+		if (svc->oncrash_action == SVC_ONCRASH_REBOOT) {
+			logit(LOG_ERR, "%s issuing reboot", svc->cmd);
+			sync();
+			kill(1, SIGTERM);
+		}
 		service_step(svc);
 		return;
 	}
@@ -1592,12 +1713,14 @@ static void service_retry(svc_t *svc)
 
 	_d("%s crashed, trying to start it again, attempt %d", svc->cmd, *restart_cnt);
 	logit(LOG_CONSOLE | LOG_WARNING, "Service %s[%d] died, restarting (%d/%d)",
-	      svc_ident(svc, NULL, 0), svc->oldpid, *restart_cnt, SVC_RESPAWN_MAX);
+	      svc_ident(svc, NULL, 0), svc->oldpid, *restart_cnt, svc->restart_max);
 	svc_unblock(svc);
 	service_step(svc);
 
 	/* Wait 2s for the first 5 respawns, then back off to 5s */
-	timeout = ((*restart_cnt) <= (SVC_RESPAWN_MAX / 2)) ? 2000 : 5000;
+	timeout = ((*restart_cnt) <= (svc->restart_max / 2)) ? 2000 : 5000;
+	/* If a longer timeout was specified in the conf, use that instead. */
+	timeout = max(svc->restart_tmo, timeout);
 	service_timeout_after(svc, timeout, service_retry);
 }
 
@@ -1614,6 +1737,27 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
 		service_timeout_cancel(svc);
 		service_timeout_after(svc, svc->killdelay, service_kill);
 	}
+
+	if (svc_is_runtask(svc)) {
+		char success[MAX_COND_LEN], failure[MAX_COND_LEN];
+
+		snprintf(success, sizeof(success), "%s/%s/success", svc_typestr(svc), svc->name);
+		snprintf(failure, sizeof(failure), "%s/%s/failure", svc_typestr(svc), svc->name);
+
+		/* create success/failure condition when entering SVC_DONE_STATE. */
+		if (*state == SVC_DONE_STATE) {
+			if (svc->started)
+				cond_set_oneshot(success);
+			else
+				cond_set_oneshot(failure);
+		}
+
+		/* clear all conditions when entering SVC_HALTED_STATE. */
+		if (*state == SVC_HALTED_STATE) {
+			cond_clear(success);
+			cond_clear(failure);
+		}
+	}
 }
 
 /*
@@ -1656,14 +1800,15 @@ restart:
 
 	case SVC_STOPPING_STATE:
 		if (!svc->pid) {
-			char cond[MAX_COND_LEN];
+			char condstr[MAX_COND_LEN];
 
 			_d("%s: stopped, cleaning up timers and conditions ...", svc->cmd);
 			service_timeout_cancel(svc);
-			cond_clear(mkcond(svc, cond, sizeof(cond)));
+			cond_clear(mkcond(svc, condstr, sizeof(condstr)));
 
 			switch (svc->type) {
 			case SVC_TYPE_SERVICE:
+			case SVC_TYPE_SYSV:
 			case SVC_TYPE_TTY:
 				if (svc_has_post(svc)) {
 					svc_set_state(svc, SVC_CLEANUP_STATE);
@@ -1674,7 +1819,6 @@ restart:
 
 			case SVC_TYPE_TASK:
 			case SVC_TYPE_RUN:
-			case SVC_TYPE_SYSV:
 				svc_set_state(svc, SVC_DONE_STATE);
 				break;
 
@@ -1727,6 +1871,9 @@ restart:
 
 		if (!svc->pid) {
 			if (svc_is_daemon(svc) || svc_is_tty(svc)) {
+				if (svc_is_forking(svc))
+					break;
+
 				svc_restarting(svc);
 				svc_set_state(svc, SVC_HALTED_STATE);
 
@@ -1734,7 +1881,8 @@ restart:
 				 * Restart directly after the first crash,
 				 * then retry after 2 sec
 				 */
-				_d("delayed restart of %s", svc->cmd);
+				if (!svc->respawn)
+					_d("delayed restart of %s", svc->cmd);
 				service_timeout_after(svc, 1, service_retry);
 				break;
 			}
@@ -1750,6 +1898,7 @@ restart:
 				break;
 			}
 		}
+		service_timeout_cancel(svc);
 
 		cond = cond_get_agg(svc->cond);
 		switch (cond) {
@@ -1908,6 +2057,65 @@ int service_completed(void)
 	return 1;
 }
 
+/*
+ * Every five¹ minutes we sweep over all services, skipping crashed or
+ * otherwise no longer running ones.  Decrement non-zero crash counters
+ * to allow services that have started after an initial crash to slowly
+ * prove themselves again as stable services.  Previously this counter
+ * was reset as soon as such services had stopped crashing at least once
+ * per second.  This new scheme allows us to catch those that rage-quit
+ * immediately when we try to start them, but now also those that are
+ * only slightly buggy -- when they reach their restart_max, they too
+ * are marked 'crashed'.
+ *
+ * This does not affect the restart_tot counter, which you can see in
+ * the output from 'initctl status foo', along with this instability
+ * "index" in parethesis: total (cnt/max)
+ */
+static void service_interval_cb(uev_t *w, void *arg, int events)
+{
+	svc_t *svc, *iter = NULL;
+
+	(void)arg;
+	if (UEV_ERROR == events) {
+		uev_timer_start(w);
+		return;
+	}
+
+	for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
+		if (svc_is_daemon(svc) || svc_is_sysv(svc)) {
+			char *restart_cnt = (char *)&svc->restart_cnt;
+
+			if (!svc_is_running(svc))
+				continue;
+
+			if (*restart_cnt > 0) {
+				logit(LOG_CONSOLE | LOG_DEBUG, "Aging %s instability index (%d/%d)",
+				      svc_ident(svc, NULL, 0), svc->restart_cnt, svc->restart_max);
+				(*restart_cnt)--;
+			}
+		}
+	}
+
+	service_init();
+}
+
+/*
+ * The service_interval may change (conf) between invocations, so we
+ * periodically reset the one-shot timer instead of using a periodic.
+ */
+void service_init(void)
+{
+	static int initialized = 0;
+	static uev_t watcher;
+
+	if (!initialized) {
+		uev_timer_init(ctx, &watcher, service_interval_cb, NULL, service_interval, 0);
+		initialized = 1;
+	} else
+		uev_timer_set(&watcher, service_interval, 0);
+}
+
 /**
  * Local Variables:
  *  indent-tabs-mode: t

src/service.h

@@ -41,6 +41,8 @@ void      service_worker         (void *unused);
 
 int       service_completed      (void);
 
+void      service_init           (void);
+
 #endif	/* FINIT_SERVICE_H_ */
 
 /**

src/sig.c

@@ -55,7 +55,7 @@
  * SIGINT
  *      Sent from kernel when the CTRL-ALT-DEL key combo is pressed.
  *      SysV init and systemd default to reboot with `shutdown -r`.
- *      Finit currently forwards this to SIGTERM.
+ *      Finit defaults to nothing but sets sys/key/ctrlaltdel condition.
  *
  * SIGWINCH
  *      Sent from kernel when the KeyboardSignal key is pressed.  Some
@@ -66,16 +66,22 @@
  *      Sent from a power daemon, like powstatd(8), on changes to the
  *      UPS status.  Traditionally SysV init read /etc/powerstatus and
  *      acted on "OK", "FAIL", or "LOW" and then removed the file.
- *      Finit currently forwards this to SIGUSR2.
+ *      Finit  defaults to nothing but sets sys/pwr/fail condition.
  */
 
 #include <dirent.h>
 #include <string.h>		/* strerror() */
+#include <sched.h>
 #include <sys/reboot.h>
 #include <sys/wait.h>
-#include <lite/lite.h>
+#ifdef _LIBITE_LITE
+# include <libite/lite.h>
+#else
+# include <lite/lite.h>
+#endif
 
 #include "finit.h"
+#include "cond.h"
 #include "conf.h"
 #include "config.h"
 #include "helpers.h"
@@ -95,11 +101,9 @@ extern svc_t *wdog;
  */
 shutop_t halt = SHUT_DEFAULT;
 
-static int   stopped = 0;
 static uev_t sigterm_watcher, sigusr1_watcher, sigusr2_watcher;
 static uev_t sighup_watcher,  sigint_watcher,  sigpwr_watcher;
 static uev_t sigchld_watcher;
-static uev_t sigstop_watcher, sigtstp_watcher, sigcont_watcher;
 
 static struct sigmap {
 	int   num;
@@ -169,7 +173,7 @@ void unmount_regular(void);
  *
  * https://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
  */
-void do_kill(int signo)
+void do_iterate_proc(int (*cb)(int, void *), void *data)
 {
 	DIR *dirp;
 
@@ -188,6 +192,8 @@ void do_kill(int signo)
 			pid = atoi(d->d_name);
 			if (!pid)
 				continue;
+			if (pid == 1)
+				continue;
 
 			snprintf(file, sizeof(file), "/proc/%s/cmdline", d->d_name);
 			fp = fopen(file, "r");
@@ -200,7 +206,11 @@ void do_kill(int signo)
 				else if (file[0] == '@')
 					_d("Skipping %s ...", &file[1]);
 				else
-					kill(pid, signo);
+					if (cb(pid, data)) {
+						_d("PID %d is still alive (%s)", pid, file);
+						fclose(fp);
+						break;
+					}
 			}
 			fclose(fp);
 		}
@@ -208,9 +218,60 @@ void do_kill(int signo)
 	}
 }
 
+static int kill_cb(int pid, void *data)
+{
+	int signo = *(int *)data;
+
+	kill(pid, signo);
+
+	return 0;
+}
+
+static int status_cb(int pid, void *data)
+{
+	int *has_proc = (int *)data;
+
+	*has_proc = 1;
+
+	return 1;
+}
+
+/* return value:
+ *  1 - at least one process remaining
+ *  0 - no processes remaining
+ */
+static int do_wait(int secs)
+{
+	const int delay = 250000;
+	int iterations = secs * 1000 * 1000 / delay;
+	int has_proc;
+
+	do {
+		do_usleep(delay);
+		while (waitpid(-1, NULL, WNOHANG) > 0)
+			;
+		has_proc = 0;
+		iterations--;
+		do_iterate_proc(status_cb, &has_proc);
+	}
+	while (has_proc && iterations > 0);
+
+	return has_proc;
+}
+
 void do_shutdown(shutop_t op)
 {
-	touch(SYNC_SHUTDOWN);
+	struct sched_param sched_param = { .sched_priority = 99 };
+	int in_cont = in_container();
+	int signo = SIGTERM;
+
+	if (!in_cont) {
+		/*
+		 * On a PREEMPT-RT system, Finit must run as the highest prioritized
+		 * RT process to ensure it completes the shutdown sequence.
+		 */
+		sched_setscheduler(1, SCHED_RR, &sched_param);
+	}
 
 	if (sdown)
 		run_interactive(sdown, "Calling shutdown hook: %s", sdown);
@@ -222,9 +283,11 @@ void do_shutdown(shutop_t op)
 	 * Tell remaining non-monitored processes to exit, give them
 	 * time to exit gracefully, 2 sec was customary, we go for 1.
 	 */
-	do_kill(SIGTERM);
-	do_sleep(1);
-	do_kill(SIGKILL);
+	do_iterate_proc(kill_cb, &signo);
+	if (do_wait(1)) {
+		signo = SIGKILL;
+		do_iterate_proc(kill_cb, &signo);
+	}
 
 	/* Exit plugins and API gracefully */
 	plugin_exit();
@@ -234,6 +297,12 @@ void do_shutdown(shutop_t op)
 	while (waitpid(-1, NULL, WNOHANG) > 0)
 		;
 
+	if (in_cont) {
+		if (osheading)
+			logit(LOG_CONSOLE | LOG_NOTICE, "%s, shutting down container.", osheading);
+		_exit(0);
+	}
+
 	/* Close all local non-console descriptors */
 	for (int fd = 3; fd < 128; fd++)
 		close(fd);
@@ -254,16 +323,22 @@ void do_shutdown(shutop_t op)
 
 	/* Unmount any tmpfs before unmounting swap ... */
 	unmount_tmpfs();
-	run("swapoff -e -a");
+	if (whichp("swapoff"))
+		run_interactive("swapoff -a", "Disabling system swap");
 
 	/* ... unmount remaining regular file systems. */
 	unmount_regular();
 
-	/* We sit on / so we must remount it ro, try all the things! */
+	/*
+	 * We sit on / so we must remount it 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 /");
-	run("mount -n -o remount,ro dummydev /");
-	run("mount -n -o remount,ro /");
+	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();
@@ -311,7 +386,9 @@ static void sighup_cb(uev_t *w, void *arg, int events)
 }
 
 /*
- * SIGINT: Should generate <sys/key/ctrlaltdel> condition, for now reboot
+ * SIGINT: generates <sys/key/ctrlaltdel> condition, which the sys.so
+ *         plugin picks up and tells Finit to start any service(s) or
+ *         task(s) associated with the condition.
  */
 static void sigint_cb(uev_t *w, void *arg, int events)
 {
@@ -321,8 +398,23 @@ static void sigint_cb(uev_t *w, void *arg, int events)
 		return;
 	}
 
-	halt = SHUT_REBOOT;
-	service_runlevel(6);
+	cond_set_oneshot_noupdate("sys/key/ctrlaltdel");
+}
+
+/*
+ * SIGPWR: generates <sys/pwr/fail> condition, which the sys.so plugin
+ *         picks up and tells Finit to start any service(s) or task(s)
+ *         associated with the condition.
+ */
+static void sigpwr_cb(uev_t *w, void *arg, int events)
+{
+	_d("...");
+	if (UEV_ERROR == events) {
+		_e("Unrecoverable error in signal watcher");
+		return;
+	}
+
+	cond_set_oneshot_noupdate("sys/pwr/fail");
 }
 
 /*
@@ -385,49 +477,17 @@ static void sigchld_cb(uev_t *w, void *arg, int events)
 	}
 
 	/* Reap all the children! */
-	do {
+	while (1) {
 		pid = waitpid(-1, &status, WNOHANG);
-		if (pid > 0) {
-			_d("Collected child %d", pid);
-			service_monitor(pid, status);
+		if (pid <= 0) {
+			if (pid == -1 && errno == EINTR)
+				continue;
+			break;
 		}
-	} while (pid > 0);
-}
 
-/*
- * SIGSTOP/SIGTSTP: Paused by user or netflash
- */
-static void sigstop_cb(uev_t *w, void *arg, int events)
-{
-	if (UEV_ERROR == events) {
-		_e("Unrecoverable error in signal watcher");
-		return;
+		_d("Collected child %d", pid);
+		service_monitor(pid, status);
 	}
-
-	touch(SYNC_STOPPED);
-	stopped++;
-}
-
-/*
- * SIGCONT: Restart service monitor
- */
-static void sigcont_cb(uev_t *w, void *arg, int events)
-{
-	if (UEV_ERROR == events) {
-		_e("Unrecoverable error in signal watcher");
-		return;
-	}
-
-	stopped = 0;
-	erase(SYNC_STOPPED);
-}
-
-/*
- * Is SIGSTOP asserted?
- */
-int sig_stopped(void)
-{
-	return stopped;
 }
 
 /*
@@ -463,7 +523,7 @@ const char *sig_name(int signo)
 }
 
 /*
- * Inital signal setup - ignore everything but SIGCHLD until we're capable of responding
+ * Initial signal setup - ignore everything but SIGCHLD until we're capable of responding
  */
 static void chld_handler(int sig, siginfo_t *info, void *ctx)
 {
@@ -517,10 +577,6 @@ void sig_setup(uev_ctx_t *ctx)
 
 	_d("Setup signals");
 
-	/* Cleanup any stale finit control files */
-	erase(SYNC_SHUTDOWN);
-	erase(SYNC_STOPPED);
-
 	/*
 	 * Standard SysV init calls ctrl-alt-delete handler
 	 * We need to disable kernel default so it sends us SIGINT
@@ -531,7 +587,7 @@ void sig_setup(uev_ctx_t *ctx)
 	/* BusyBox/SysV init style signals for halt, power-off and reboot. */
 	uev_signal_init(ctx, &sigusr1_watcher, sigusr1_cb, NULL, SIGUSR1);
 	uev_signal_init(ctx, &sigusr2_watcher, sigusr2_cb, NULL, SIGUSR2);
-	uev_signal_init(ctx, &sigpwr_watcher, sigusr2_cb, NULL, SIGPWR);
+	uev_signal_init(ctx, &sigpwr_watcher,  sigpwr_cb,  NULL, SIGPWR);
 	uev_signal_init(ctx, &sigterm_watcher, sigterm_cb, NULL, SIGTERM);
 
 	/* Some C APIs may need SIGALRM for implementing timers. */
@@ -543,11 +599,6 @@ void sig_setup(uev_ctx_t *ctx)
 	/* After initial bootstrap of Finit we call the service monitor to reap children */
 	uev_signal_init(ctx, &sigchld_watcher, sigchld_cb, NULL, SIGCHLD);
 
-	/* Stopping init is a bit tricky. */
-	uev_signal_init(ctx, &sigstop_watcher, sigstop_cb, NULL, SIGSTOP);
-	uev_signal_init(ctx, &sigtstp_watcher, sigstop_cb, NULL, SIGTSTP);
-	uev_signal_init(ctx, &sigcont_watcher, sigcont_cb, NULL, SIGCONT);
-
 	setsid();
 }
 

src/sig.h

@@ -28,9 +28,6 @@
 #include <signal.h>
 #include <uev/uev.h>
 
-#define SYNC_SHUTDOWN   "/var/run/finit/.shutdown"
-#define SYNC_STOPPED    "/var/run/finit/.stopped"
-
 #define SETSIG(sa, sig, fun, flags)			\
 	do {						\
 		sa.sa_sigaction = fun;			\
@@ -69,7 +66,6 @@ typedef enum {
 extern shutop_t halt;
 
 void do_shutdown    (shutop_t op);
-int  sig_stopped    (void);
 int  sig_num        (const char *name);
 void sig_init       (void);
 void sig_unblock    (void);

src/sm.c

@@ -23,6 +23,7 @@
 
 #include "config.h"		/* Generated by configure script */
 
+#include <paths.h>
 #include <sys/types.h>
 
 #include "finit.h"
@@ -38,6 +39,10 @@
 
 sm_t sm;
 
+#ifndef FINIT_NOLOGIN_PATH
+#define FINIT_NOLOGIN_PATH _PATH_NOLOGIN /* Stop user logging in. */
+#endif
+
 void sm_init(sm_t *sm)
 {
 	sm->state = SM_BOOTSTRAP_STATE;
@@ -76,16 +81,16 @@ static char *sm_status(sm_state_t state)
  * Disable login in single user mode and shutdown/reboot
  *
  * Re-enable only when going from these runlevels, this way a user can
- * manage /etc/nologin manually within the other runlevels without us
- * pulling the rug from under their feet.
+ * manage FINIT_NOLOGIN_PATH manually within the other runlevels without
+ * us pulling the rug from under their feet.
  */
 static void nologin(void)
 {
 	if (runlevel == 1 || runlevel == 0 || runlevel == 6)
-		touch("/etc/nologin");
+		touch(FINIT_NOLOGIN_PATH);
 
 	if (prevlevel == 1 || prevlevel == 0 || prevlevel == 6)
-		erase("/etc/nologin");
+		erase(FINIT_NOLOGIN_PATH);
 }
 
 void sm_set_runlevel(sm_t *sm, int newlevel)
@@ -150,7 +155,10 @@ restart:
 		}
 
 		_d("Setting new runlevel --> %d <-- previous %d", runlevel, prevlevel);
-		logit(LOG_CONSOLE | LOG_NOTICE, "%s, entering runlevel %d", INIT_HEADING, runlevel);
+		if (osheading)
+			logit(LOG_CONSOLE | LOG_NOTICE, "%s, entering runlevel %d", osheading, runlevel);
+		else
+			logit(LOG_CONSOLE | LOG_NOTICE, "Entering runlevel %d", runlevel);
 		runlevel_set(prevlevel, runlevel);
 
 		/* Disable login in single-user mode as well as shutdown/reboot */
@@ -184,7 +192,7 @@ restart:
 		}
 
 		/* Prev runlevel services stopped, call hooks before starting new runlevel ... */
-		_d("All services have been stoppped, calling runlevel change hooks ...");
+		_d("All services have been stopped, calling runlevel change hooks ...");
 		plugin_run_hooks(HOOK_RUNLEVEL_CHANGE);  /* Reconfigure HW/VLANs/etc here */
 
 		_d("Starting services new to this runlevel ...");