Explain finit.conf commands more in README, update example .conf

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
Bump version and start preparing docs for release of 1.8
2026-10-12 10:12:32 +00:00 · 2013-06-07 14:09:46 +02:00 · 2013-06-07 09:16:00 +02:00 · 2013-06-06 18:19:27 +02:00 · 2013-06-06 18:19:27 +02:00 · 2013-06-06 18:19:27 +02:00
36 changed files with 1999 additions and 447 deletions
@@ -1,112 +0,0 @@
-1.7 (20121008)
-	- Show __FILE__ in _d() debug messages, useful for plugins with
-	  similarily 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.
-	- Bugfix: Do not free() static string in finit.conf parser
-	- Only clear screen when in verbose mode. Maybe this should
-	  be removed altogether?
-
-1.6 (20121006)
-	- Skip . and .. in plugin loader and display error on failed plugins
-	- Support for overriding /etc/finit.d with "runparts DIR" in finit.conf
-	- Revoke support for starting services not starting with a slash.
-	- Prevent endless restart of non-existing services in finit.conf
-	- Support for sysvinit style startstop scripts in /etc/finit.d
-	- Minor fix to alsa-utils plugin to silence on non-existing cards
-
-1.5 (20121003)
-	- Use bootmisc plugin to setup standard FHS 2.3 structure in /var
-	- Added FLOG_WARN() syslog macro, for plugins
-	- Add plugin dependency resolver. Checks plugin_t for .depends
-
-1.4 (20121002)
-	- Fix I/O plugin watcher and load plugins earlier for a new hook
-	- Start refactoring helpers.c into a libite.so (-lite).  This
-	  means other user space applications/daemons can make use of
-	  the neat toolbox available in finit
-	- Use short-form -s/-w -u to work with BusyBox hwclock as well
-	- Use RTLD_GLOBAL flag to tell dynamic loader to load dependent
-	  .so files as well.  Lets other plugins use global symbols.
-	- Greatly simplify svc hook for external plugins and cleanup
-	  the plugin API.
-	- And more... see the GIT log for more details.
-
-1.3 (20120928)
-	- Cleanup public plugin API a bit and add new pid/pidfile funcs
-	- Add plugin hook to end of service startup
-	- Remove finit.h from svc.h, plugins should not need this.
-	- Move utility macros etc. to helpers.h
-	- Make finit.h daemon internal, only
-	- Move defines of FIFO, conf and rcS.d to Makefile => correct paths
-	- Add support for installing required headers in system include dir
-	- Better support for distributions and packagers with install-exec,
-	  install-data, and install-dev targets in Makefile.  Useful if you
-	  want to call targets with different $DESTDIR!
-	- Makefile fixes for installation, paths encoded wrong
-	- Strip binaries + .so files, support for $(CROSS) toolchain strip
-	- Default install is now to /sbin/finit and /usr/
-	- Note change in $PLUGIN_DIR environemnt variable to $plugindir
-
-1.2 (20120927)
-	- Fix installation paths encoded in finit binary
-	- Update README with section on building and enviroment variables
-
-1.1 (20120927)
-	- Build fixes for ARM eabi/uClibc
-	- Rename signal.[ch]-->sig.[ch] to avoid name clash w/ system headers
-
-1.0 (20120926)
-	- New plugin based system for all odd extensions
-	- New service monitor that restarts services if they die
-	- New maintainer at GitHub http://github.com/troglobit/finit
-	- Add standard LICENSE and AUTHORS files
-	- New focus: embedded systems and small headless servers
-
-0.6 (20100614)
-	- don't start consolekit manually, dbus starts it (rtp)
-	- unmount all filesystems before rebooting
-	- disable USE_VAR_RUN_RESOLVCONF for Mandriva
-	- unset terminal type in Mandriva before running X
-	- remove extra sleep in finit-alt before calling services.sh (caio)
-
-0.5 (20080821)
-	- add option to start dbus and consolekit before the X server
-	- finit-alt listens to /dev/initctl to work with reboot(8) (smurfy)
-	- write runlevel to utmp, needed by Printerdrake (Pascal Terjan)
-	- fix ownership of /var/run/utmp (reported by Pascal Terjan)
-	- remove obsolete code to load AGP drivers
-	- conditional build of /etc/resolveconf/run support
-	- add support to /var/run/resolvconf in Mandriva (blino)
-
-O.4 (20080516)
-	- default username for finit-alt configurable in Makefile
-	- create loopback device node in finit-alt (for squashfs)
-	- add option to use built-in run-parts instead of /bin/run-parts
-	- ignore signal instead of setting to an empty handler (Metalshark)
-	- handle pam_console permissions in finit-alt for Mandriva
-	- add services.sh example and nash-hotplug patch for Mandriva
-	- mount /proc/bus/usb in Mandriva
-	- add runtime debug to finit-alt if finit_debug parameter is specified
-	- read configuration from /etc/finit.conf
-	- run getty with openvt on the virtual terminal
-
-0.3 (20080223)
-	- Change poweroff method to reboot(RB_POWER_OFF) (Metalshark)
-	- Remove duplicate unionctl() reimplementation error
-	- Fix string termination in path creation
-	- Mount /var/lock and /var/run as tmpfs
-
-0.2 (20080219)
-	- replace system("touch") with touch() in finit-mod (Metalshark)
-	- disable NO_HCTOSYS by default to match stock Eeepc kernel
-	- drop system("rm -f") to clean /tmp, its a fresh mounted tmpfs
-	- write ACPI sleep state to /sys/power/state instead of
-	  /proc/acpi/sleep (Metalshark)
-	- use direct calls to set loopback instead of system("ifconfig")
-	- replace system("cat") and system("dd") with C implementation
-	- moved finit-mod and finit-alt helpers to helpers.c
-	- replace system("echo;cat") to draw shutdown splash with C calls
-
-0.1 (20080214)
-	- initial release
@@ -25,24 +25,21 @@
 	install-exec install-data install-dev		\
 	uninstall-exec uninstall-data uninstall-dev

-# Top directory for building complete system, fall back to this directory
-ROOTDIR     = $(shell pwd)
-
 #VERSION    ?= $(shell git tag -l | tail -1)
-VERSION    ?= 1.7
+VERSION    ?= 1.8
 NAME        = finit
 PKG         = $(NAME)-$(VERSION)
 DEV         = $(NAME)-dev
 ARCHIVE     = $(PKG).tar.xz
 EXEC        = finit reboot
 HEADERS     = plugin.h svc.h helpers.h queue.h
-DISTFILES   = LICENSE README ChangeLog finit.conf services
-OBJS        = finit.o conf.o helpers.o sig.o svc.o plugin.o
-OBJS       += strlcpy.o
+DISTFILES   = LICENSE README NEWS finit.conf services
+OBJS        = finit.o conf.o helpers.o sig.o svc.o plugin.o tty.o
 SRCS        = $(OBJS:.o=.c)
 DEPS        = $(addprefix .,$(SRCS:.c=.d))

 # Installation paths, always prepended with DESTDIR if set
+TOPDIR      = $(shell pwd)
 prefix     ?= /usr
 sysconfdir ?= /etc
 sbindir    ?= /sbin
@@ -64,7 +61,7 @@ CPPFLAGS   += -Ilibite -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE
 CPPFLAGS   += -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\"
 CPPFLAGS   += -DFINIT_FIFO=\"$(FINIT_FIFO)\" -DFINIT_CONF=\"$(FINIT_CONF)\"
 CPPFLAGS   += -DFINIT_RCSD=\"$(FINIT_RCSD)\" -DPLUGIN_PATH=\"$(plugindir)\"
-LDFLAGS    += -rdynamic -L$(ROOTDIR)/libite
+LDFLAGS    += -rdynamic -L$(TOPDIR)/libite
 DEPLIBS     = libite/libite.so
 LDLIBS     += -ldl -lite

@@ -158,9 +155,6 @@ dev: distclean
 	  cd - >/dev/null; mv $$dir/$(DEV).tar.xz ../; cd ..;        \
 	  rm -rf $$dir; md5sum $(DEV).tar.xz | tee $(DEV).tar.xz.md5)

-# Include automatically generated rules, such as:
-# uncgi.o: .../some/dir/uncgi.c /usr/include/stdio.h
-# but don't bother during clean!
 ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(MAKECMDGOALS),distclean)
 -include $(DEPS)
@@ -0,0 +1 @@
+NEWS.rst
@@ -0,0 +1,159 @@
+==============================================================================
+                                    NEWS
+==============================================================================
+
+1.8 (2013-06-07)
+----------------
+* Support for runlevels, with a bootstrap runlevel 'S'
+* Support for saving previous and current runlevel to UTMP
+* Support for new finit.conf commands: run, task, and runlevel
+* Support for tty and console commands in finit.conf, like services but
+  for launching multiple getty logins
+* New tty plugin to monitor TTYs coming and going, like USB TTYs
+* Bugfixes to libite
+
+
+1.7 (2012-10-08)
+----------------
+* Show __FILE__ in _d() debug messages, useful for plugins with
+  similarily 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.
+* Bugfix: Do not free() static string in finit.conf parser
+* Only clear screen when in verbose mode. Maybe this should be removed
+  altogether?
+
+
+1.6 (2012-10-06)
+----------------
+* Skip . and .. in plugin loader and display error on failed plugins
+* Support for overriding /etc/finit.d with "runparts DIR" in finit.conf
+* Revoke support for starting services not starting with a slash.
+* Prevent endless restart of non-existing services in finit.conf
+* Support for sysvinit style startstop scripts in /etc/finit.d
+* Minor fix to alsa-utils plugin to silence on non-existing cards
+
+
+1.5 (2012-10-03)
+----------------
+* Use bootmisc plugin to setup standard FHS 2.3 structure in /var
+* Added FLOG_WARN() syslog macro, for plugins
+* Add plugin dependency resolver. Checks plugin_t for .depends
+
+
+1.4 (2012-10-02)
+----------------
+* Fix I/O plugin watcher and load plugins earlier for a new hook
+* Start refactoring helpers.c into a libite.so (-lite).  This means
+  other user space applications/daemons can make use of the neat toolbox
+  available in finit
+* Use short-form -s/-w -u to work with BusyBox hwclock as well
+* Use RTLD_GLOBAL flag to tell dynamic loader to load dependent .so
+  files as well.  Lets other plugins use global symbols.
+* Greatly simplify svc hook for external plugins and cleanup plugin API.
+* And more... see the GIT log for more details.
+
+
+1.3 (2012-09-28)
+----------------
+* Cleanup public plugin API a bit and add new pid/pidfile funcs
+* Add plugin hook to end of service startup
+* Remove finit.h from svc.h, plugins should not need this.
+* Move utility macros etc. to helpers.h
+* Make finit.h daemon internal, only
+* Move defines of FIFO, conf and rcS.d to Makefile => correct paths
+* Add support for installing required headers in system include dir
+* Better support for distributions and packagers with install-exec,
+  install-data, and install-dev targets in Makefile.  Useful if you want
+  to call targets with different $DESTDIR!
+* Makefile fixes for installation, paths encoded wrong
+* Strip binaries + .so files, support for $(CROSS) toolchain strip
+* Default install is now to /sbin/finit and /usr/
+* Note change in $PLUGIN_DIR environemnt variable to $plugindir
+
+
+1.2 (2012-09-27)
+----------------
+* Fix installation paths encoded in finit binary
+* Update README with section on building and enviroment variables
+
+
+1.1 (2012-09-27)
+----------------
+* Build fixes for ARM eabi/uClibc
+* Rename signal.[ch]-->sig.[ch] to avoid name clash w/ system headers
+
+
+1.0 (2012-09-26)
+----------------
+* New plugin based system for all odd extensions
+* New service monitor that restarts services if they die
+* New maintainer at GitHub http://github.com/troglobit/finit
+* Add standard LICENSE and AUTHORS files
+* New focus: embedded systems and small headless servers
+
+
+0.6 (2010-06-14)
+----------------
+* don't start consolekit manually, dbus starts it (rtp)
+* unmount all filesystems before rebooting
+* disable USE_VAR_RUN_RESOLVCONF for Mandriva
+* unset terminal type in Mandriva before running X
+* remove extra sleep in finit-alt before calling services.sh (caio)
+
+
+0.5 (2008-08-21)
+----------------
+* add option to start dbus and consolekit before the X server
+* finit-alt listens to /dev/initctl to work with reboot(8) (smurfy)
+* write runlevel to utmp, needed by Printerdrake (Pascal Terjan)
+* fix ownership of /var/run/utmp (reported by Pascal Terjan)
+* remove obsolete code to load AGP drivers
+* conditional build of /etc/resolveconf/run support
+* add support to /var/run/resolvconf in Mandriva (blino)
+
+
+O.4 (2008-05-16)
+----------------
+* default username for finit-alt configurable in Makefile
+* create loopback device node in finit-alt (for squashfs)
+* add option to use built-in run-parts instead of /bin/run-parts
+* ignore signal instead of setting to an empty handler (Metalshark)
+* handle pam_console permissions in finit-alt for Mandriva
+* add services.sh example and nash-hotplug patch for Mandriva
+* mount /proc/bus/usb in Mandriva
+* add runtime debug to finit-alt if finit_debug parameter is specified
+* read configuration from /etc/finit.conf
+* run getty with openvt on the virtual terminal
+
+
+0.3 (2008-02-23)
+----------------
+* Change poweroff method to reboot(RB_POWER_OFF) (Metalshark)
+* Remove duplicate unionctl() reimplementation error
+* Fix string termination in path creation
+* Mount /var/lock and /var/run as tmpfs
+
+
+0.2 (2008-02-19)
+----------------
+* replace system("touch") with touch() in finit-mod (Metalshark)
+* disable NO_HCTOSYS by default to match stock Eeepc kernel
+* drop system("rm -f") to clean /tmp, its a fresh mounted tmpfs
+* write ACPI sleep state to /sys/power/state instead of /proc/acpi/sleep
+  (Metalshark)
+* use direct calls to set loopback instead of system("ifconfig")
+* replace system("cat") and system("dd") with C implementation
+* moved finit-mod and finit-alt helpers to helpers.c
+* replace system("echo;cat") to draw shutdown splash with C calls
+
+
+0.1 (2008-02-14)
+----------------
+* initial release
+
+
+.. Local Variables:
+..  mode: rst
+..  version-control: t
+.. End:
@@ -1,5 +1,5 @@
 ==============================================================================
-        Finit — A fast plugin-based /sbin/init with service monitoring
+       Finit — A fast plugin-based /sbin/init with service monitoring
 ==============================================================================

 Welcome to finit!
@@ -7,8 +7,8 @@ Welcome to finit!
 This is an extremely fast /sbin/init replacement with focus on small
 embedded GNU/Linux systems.  Based on Claudio Matsuoka's original finit_
 with I/O, service and hook plugin extensions.  The original was a
-reimplementation of the EeePC fastinit_ daemon based on its system
-calls with gaps filled with frog DNA.
+reimplementation of the EeePC fastinit_ daemon based on its system calls
+with gaps filled with frog DNA.

 In the world of finit we write C plugins that hook into and extend the
 ``main()`` loop of ``/sbin/init``, this is what gives the system its raw
@@ -21,15 +21,16 @@ Features
 --------

 **Service monitoring**
-   Restarting a service when it exits
+Restarting a service when it exits

 **Plugins**
-   Extend and modify finit behavior. See examples in plugins/ directory.
-   Plugin capabilities:
+Extend and modify finit behavior. See examples in plugins/ directory.
+Plugin capabilities:
   
-   * Service callbacks — should the service run/restart/stop?
-   * Hooks — hook into the boot at predefined points to extend finit
-   * I/O — listen to external events and control finit behaviour/services
+* Service callbacks — should the service run/restart/stop?
+* Task/Run callbacks — a one-shot command, should it run in sequence?
+* Hooks — hook into the boot at predefined points to extend finit
+* I/O — listen to external events and control finit behaviour/services

 Most extensions and functionality not purely related to what an /sbin/init
 needs to start a system from the original finit_ has been reactored into
@@ -41,7 +42,46 @@ plugins with either hooks or I/O demands.

 Contrary to most script based init alternatives (`SysV init`_, upstart_,
 OpenRC_ and the likes) finit instead reads its configuration from
-``/etc/finit.conf``, see the source code for available options.
+``/etc/finit.conf``.  Below is a brief list, see the source code for the
+full list:
+
+check
+    Run fsck on a file system before mounting it
+
+module
+    Load a kernel module, with optional arguments
+
+network
+    Script or program to bringup networking, with optional arguments
+
+runlevel N
+    N is the runlevel number 1-9, where 6 is reserved for reboot
+
+run [RUN_LVLS] /path/to/cmd ARGS -- Optional description
+    One-shot command to run in sequence when entering a runlevel, with
+    optional arguments and description.  This command is guaranteed to
+    be completed before running the next command.
+
+task [RUN_LVLS] /path/to/cmd ARGS -- Optional description
+    One-shot like 'run', but starts in parallel with the next command
+
+service [RUN_LVLS] /path/to/daemon ARGS -- Optional description
+    Service, or daemon, to be monitored and automatically restarted if
+    it exits prematurely.  Please note that you often need to provide
+    a --foreground or --no-background argument to most daemons to
+    prevent them from forking off to the background.
+
+runparts
+    Call run-parts(8) on a directory other than the default /etc/finit.d
+
+tty [RUN_LVLS] DEV
+    Run getty on the listed TTY device, in the given runlevels
+
+console DEV
+    Some embedded systems have a dedicated console port. This command
+    tells finit to not start getty, but instead print a friendly message
+    and wait for the user to activate the console with a keypress before
+    starting getty.

 When running ``make install`` no default ``/etc/finit.conf`` will be
 provided since the system requirements differ too much.  Try out the
@@ -54,10 +94,46 @@ getty!
 ------------

 At the end of the boot, when networking and all services are up, finit
-calls its built-in run-parts(8) on the ``/etc/finit.d/`` directory, akin
-to how the ``/ec/rc.local`` file works in most other inits, only finit
-runs a directory of scripts.  This replaces the earlier
-``/usr/sbin/services.sh`` support of the original finit_.
+calls its built-in run-parts(8) on the ``/etc/finit.d/`` directory, if
+it exists.  Similar to how the ``/ec/rc.local`` file works in most other
+inits, only finit runs a directory of scripts.  This replaces the
+earlier support for a ``/usr/sbin/services.sh`` script in the original
+finit_.
+
+
+Runlevels
+---------
+
+Support for runlevels_ is included in Finit from v1.8.  By default all
+services, tasks, run commands and TTYs listed without a set of runlevels
+get a default set [234] assigned.  The default runlevel after boot is 2.
+
+To specify an allowed set of runlevels for a service, run command, task,
+or tty, add [NNN] to it in finit.conf, like this:
+
+        run     [S]      /etc/init.d/acpid start -- Starting ACPI Daemon
+        task    [S]      /etc/init.d/kbd start -- Preparing console
+        service [S12345] /sbin/klogd -n -x -- Kernel log daemon
+        tty     [12345]  /dev/tty1
+        tty     [2]      /dev/tty2
+        tty     [2]      /dev/tty3
+        tty     [2]      /dev/tty4
+        tty     [2]      /dev/tty5
+        tty     [2]      /dev/tty6
+
+In this example acpid is started once at bootstrap using a conventional
+SysV init script. Here the run command was used, meaning the following
+task command is not run until the init script has fully completed.
+
+Tasks and services are started in parallell, while run commands are run
+in the order listed and subsequent commands are not started until a run
+command has completed.
+
+Existing finit.conf files that lack runlevel setting will get a default
+runlevel assigned, [234].
+
+Switching between runlevels can be done by calling init with a single
+argument, e.g., 'init 5' switches to runlevel 5.


 Rebooting and Halting
@@ -191,5 +267,6 @@ Regards
 .. _fastinit: http://wiki.eeeuser.com/boot_process:the_boot_process
 .. _`SysV init`: http://savannah.nongnu.org/projects/sysvinit
 .. _upstart: http://upstart.ubuntu.com/
+.. _runlevels: http://en.wikipedia.org/wiki/Runlevel
 .. _openrc: http://www.gentoo.org/proj/en/base/openrc/
 .. _`finit-1.3.tar.xz`: http://github.com/downloads/troglobit/finit/finit-1.3.tar.xz
@@ -1,6 +0,0 @@
-* FHS changes, see http://askubuntu.com/questions/57297/why-has-var-run-been-migrated-to-run
-* Look at Erik Troan's nash linuxrc parser for more inspiration
-* Look at how to support a standard SysV init runlevel mechanism
-* Arguments to finit, like to SysV init "init q" to reload finit.conf at runtime, etc.
-* Implement initctl stop|start|reload <SVC> and service <SVC> stop|start|reload on top
-* Write man pages for finit and finit.conf, steal from pimd man pages...
@@ -0,0 +1 @@
+TODO.rst
@@ -0,0 +1,105 @@
+==============================================================================
+                                    TODO
+==============================================================================
+
+Unsorted TODO list of features and points of investigation that could be
+useful for improving finit.  But what is an improvement to finit?  Well,
+similiar to launchd, the goal of finit is to be a FAST replacement for:
+
+* init
+* inetd
+* crond
+* watchdogd
+
+The main goal is to be FAST. Secondary goals are to be: small, simple
+and with a very low dependency on external packages.
+
+
+Priority
+--------
+The intent of finit is to monitor not just processes, but also to
+be able to supervise the entire system and the behavior of certain
+processes that declare themselves to be finit compliant.
+
+* Integrate the ingenious libev to handle all events: signals, polling
+  fd's, etc.  Because "Event driven software improves concurrency" --
+  Dave Zarzycki, Apple.  See the `launchd video`_ for more info!
+* Add support for process and system supervision.  Which could
+  be an API wrapping, e.g., TIPC and loadavg.
+* Add support for a /dev/watchdog plugin to replace watchdogd
+* Integrate watchdog plugin with process/system supervisor to
+  reboot the system when a process stops responding, or when
+  restarting it is imposible, as well as when system load gets
+  too high.
+
+
+Configuration
+-------------
+* Add support for "init <q | reload-configuration>" and SIGHUP to
+  reload finit.conf, but also
+* Add support for inotify to automatically reload finit.conf
+
+
+Runlevels
+---------
+* Add support for "runlevel N" to finit.conf
+* Improve support for runlevels: startup, running (services from
+  finit.conf), and shutdown as well as hooks when switching RL, startup
+  at RL 1 and a default run level.
+* Implement initctl stop|start|restart|reload|status <SVC> and service
+  <SVC> stop|start|restart|reload|status on top
+* Add PRE and POST hooks for when changing runlevels
+* SysV init in Debian uses an rcS.d/ for scripts that should run once at
+  boot.  These scripts are run before the actual runlevel, which is set
+  in inittab.  We could use "task [S]" and "run [S]" (below) for this.
+* Add support for a new runlevel 'S' that is started before all other
+  services in the selected runlevel.
+
+
+Services and Tasks
+------------------
+Both the "task" and "boot" stanzas below are like "service", share the
+same mechanism for registering callbacks.  These callbacks can be used
+to check a configuration db and return 1 (RUN), 2 (STOP), or 3 (RELOAD).
+
+* Add support for "task [RUNLVL] ..." similar to services, but one-shot.
+* Add support for "run [RUNLVL] ..." similar to task, but waits for
+  completion before continuing with the next task/service
+* Add support for service/task/run dependencies
+* Add support for "init list" to show running services
+
+It is tempting to say that a task called at runlevel S would be a
+blocking call, like run, but there are likely use-cases when you want to
+call on-shot tasks in parallell with something else, even at boot. Hence
+the differentiation between "task" and "run", which are essentially the
+same, except for the "pause and wait for completion" that "run" has.
+
+
+Miscellaneous
+-------------
+* Add support for "init -v,--version | version"
+* Cleanup move sources from top-level directory to src/ and include/
+* Make sure to install queue.h to $(PREFIX)/include/finit/queue.h
+* Move finit.conf "check" command to plugin which checks /etc/fstab
+  instead. This is the de-facto practise.  But keep the check command
+  for really low-end systems w/o /etc/fstab.
+
+
+Documentation
+-------------
+* Write man pages for finit and finit.conf, steal from pimd man pages...
+* Update Debian finit.conf example with runlevels, tty/console and
+  dependency handling
+
+
+Investigation
+-------------
+* `FHS changes`_ affecting runtime status, plugins, etc.
+
+.. _`launchd video`: http://www.youtube.com/watch?v=cD_s6Fjdri8
+.. _`FHS changes`: http://askubuntu.com/questions/57297/why-has-var-run-been-migrated-to-run
+..
+.. Local Variables:
+..  mode: rst
+..  version-control: t
+.. End:
@@ -1,9 +1,12 @@
+# Top directory for building complete system, fall back to this directory
+ROOTDIR    ?= $(TOPDIR)
+
 # Some junk files we always want to be removed when doing a make clean.
-JUNK       = *~ *.bak *.aux *.dvi *.idx *.ind *.log *.ps *.map .*.d DEADJOE semantic.cache *.gdb *.elf core core.*
-MAKE      := @$(MAKE)
-MAKEFLAGS  = --no-print-directory --silent
-INSTALL   := install --backup=off
-STRIPINST := $(INSTALL) -s --strip-program=$(CROSS)strip -m 0755
+JUNK        = *~ *.bak *.aux *.dvi *.idx *.ind *.log *.ps *.map .*.d DEADJOE semantic.cache *.gdb *.elf core core.*
+MAKE       := @$(MAKE)
+MAKEFLAGS   = --no-print-directory --silent
+INSTALL    := install --backup=off
+STRIPINST  := $(INSTALL) -s --strip-program=$(CROSS)strip -m 0755

 # Smart autodependecy generation via GCC -M.
 .%.d: %.c
@@ -21,41 +21,69 @@
 * THE SOFTWARE.
 */

+#include <ctype.h>
 #include <string.h>

 #include "finit.h"
 #include "svc.h"
+#include "tty.h"
+#include "lite.h"
 #include "helpers.h"

-/* Match one command. */
-#define MATCH_CMD(l, c, x)					\
+#define MATCH_CMD(l, c, x) \
 	(!strncmp(l, c, strlen(c)) && (x = (l) + strlen(c)))

-
-static char *build_cmd(char *cmd, char *line, int len)
+static char *strip_line(char *line)
 {
-	int l;
-	char *c;
+	char *ptr;

 	/* Trim leading whitespace */
-	while (*line && (*line == ' ' || *line == '\t'))
+	while (*line && isblank(*line))
 		line++;

-	if (!cmd) {
-		cmd = malloc (strlen(line) + 1);
-		if (!cmd) {
-			_e("No memory left for '%s'", line);
-			return NULL;
-		}
-		*cmd = 0;
-	}
-	c = cmd + strlen(cmd);
-	for (l = 0; *line && *line != '#' && *line != '\t' && l < len; l++)
-		*c++ = *line++;
-	*c = 0;
+	/* Strip any comment at end of line */
+	ptr = line;
+	while (*ptr && *ptr != '#')
+		ptr++;
+	*ptr = 0;

-	_d("cmd = %s", cmd);
-	return cmd;
+	return line;
+}
+
+/* Convert optional "[!123456789S]" string into a bitmask */
+int parse_runlevels(char *runlevels)
+{
+	int i, not = 0, bitmask = 0;
+
+	if (!runlevels)
+		runlevels = "[234]";
+	i = 1;
+	while (i) {
+		int level;
+		char lvl = runlevels[i++];
+
+		if (']' == lvl || 0 == lvl)
+			break;
+		if ('!' == lvl) {
+			not = 1;
+			bitmask = 0x3FE;
+			continue;
+		}
+
+		if ('s' == lvl || 'S' == lvl)
+			lvl = '0';
+
+		level = lvl - '0';
+		if (level > 9 || level < 0)
+			continue;
+
+		if (not)
+			CLRBIT(bitmask, level);
+		else
+			SETBIT(bitmask, level);
+	}
+
+	return bitmask;
 }

 void parse_finit_conf(char *file)
@@ -70,69 +98,124 @@ void parse_finit_conf(char *file)

 	if ((fp = fopen(file, "r")) != NULL) {
 		char *x;
+		const char *err = NULL;

 		_d("Parse %s ...", file);
 		while (!feof(fp)) {
 			if (!fgets(line, sizeof(line), fp))
 				continue;
 			chomp(line);
-
 			_d("conf: %s", line);

 			/* Skip comments. */
-			if (MATCH_CMD(line, "#", x)) {
+			if (MATCH_CMD(line, "#", x))
 				continue;
-			}
-			/* Do this before mounting / read-write */
+
+			/* Do this before mounting / read-write
+			 * XXX: Move to plugin which checks /etc/fstab instead */
 			if (MATCH_CMD(line, "check ", x)) {
+				char *dev = strip_line(x);
+
 				strcpy(cmd, "/sbin/fsck -C -a ");
-				build_cmd(cmd, x, CMD_SIZE);
-				run_interactive(cmd, "Checking file system integrity on %s", x);
+				strlcat(cmd, dev, sizeof(cmd));
+				run_interactive(cmd, "Checking file system %s", dev);
+
 				continue;
 			}
+
 			if (MATCH_CMD(line, "user ", x)) {
 				if (username) free(username);
-				username = build_cmd(NULL, x, USERNAME_SIZE);
+				username = strdup(strip_line(x));
 				continue;
 			}
 			if (MATCH_CMD(line, "host ", x)) {
 				if (hostname) free(hostname);
-				hostname = build_cmd(NULL, x, HOSTNAME_SIZE);
-				continue;
-			}
-			if (MATCH_CMD(line, "shutdown ", x)) {
-				if (sdown) free(sdown);
-				sdown = build_cmd(NULL, x, CMD_SIZE);
+				hostname = strdup(strip_line(x));
 				continue;
 			}
+
 			if (MATCH_CMD(line, "module ", x)) {
+				char *mod = strip_line(x);
+
 				strcpy(cmd, "/sbin/modprobe ");
-				build_cmd(cmd, x, CMD_SIZE);
-				run_interactive(cmd, "   Loading module %s", x);
+				strlcat(cmd, mod, sizeof(cmd));
+				run_interactive(cmd, "Loading kernel module %s", mod);
+
 				continue;
 			}
 			if (MATCH_CMD(line, "mknod ", x)) {
+				char *dev = strip_line(x);
+
 				strcpy(cmd, "/bin/mknod ");
-				build_cmd(cmd, x, CMD_SIZE);
-				run_interactive(cmd, "   Creating device node %s", x);
+				strlcat(cmd, dev, sizeof(cmd));
+				run_interactive(cmd, "Creating device node %s", dev);
+
 				continue;
 			}
+
 			if (MATCH_CMD(line, "network ", x)) {
 				if (network) free(network);
-				network = build_cmd(NULL, x, CMD_SIZE);
+				network = strdup(strip_line(x));
 				continue;
 			}
 			if (MATCH_CMD(line, "runparts ", x)) {
 				if (rcsd) free(rcsd);
-				rcsd = build_cmd(NULL, x, CMD_SIZE);
+				rcsd = strdup(strip_line(x));
 				continue;
 			}
 			if (MATCH_CMD(line, "startx ", x)) {
-				svc_register(x, username);
+				svc_register(SVC_CMD_SERVICE, strip_line(x), username);
 				continue;
 			}
+			if (MATCH_CMD(line, "shutdown ", x)) {
+				if (sdown) free(sdown);
+				sdown = strdup(strip_line(x));
+				continue;
+			}
+
+			/* The desired runlevel to start when leaving
+			 * bootstrap (S).  Finit supports 1-9, but most
+			 * systems only use 1-6, where 6 is reserved for
+			 * reboot */
+			if (MATCH_CMD(line, "runlevel ", x)) {
+				char *token = strip_line(x);
+
+				cfglevel = strtonum(token, 1, 9, &err);
+				if (err)
+					cfglevel = RUNLEVEL;
+				if (cfglevel < 1 || cfglevel > 9 || cfglevel == 6)
+					cfglevel = 2; /* Fallback */
+				continue;
+			}
+
+			/* Monitored daemon, will be respawned on exit, as
+			 * long as the (optional) service callback returns
+			 * non-zero */
 			if (MATCH_CMD(line, "service ", x)) {
-				svc_register(x, NULL);
+				svc_register(SVC_CMD_SERVICE, x, NULL);
+				continue;
+			}
+
+			/* One-shot task, will not be respawned. Only runs if
+			 * the (optional) service callback returns true */
+			if (MATCH_CMD(line, "task ", x)) {
+				svc_register(SVC_CMD_TASK, x, NULL);
+				continue;
+			}
+
+			/* Like task but waits for completion, useful w/ [S] */
+			if (MATCH_CMD(line, "run ", x)) {
+				svc_register(SVC_CMD_RUN, x, NULL);
+				continue;
+			}
+
+			if (MATCH_CMD(line, "console ", x)) {
+				if (console) free(console);
+				console = strdup(strip_line(x));
+				continue;
+			}
+			if (MATCH_CMD(line, "tty ", x)) {
+				tty_register(strip_line(x));
 				continue;
 			}
 		}
@@ -0,0 +1,65 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          keyboard-setup
+# Required-Start:    mountkernfs
+# Required-Stop:
+# Should-Start:      keymap udev
+# X-Start-Before:    checkroot
+# Default-Start:     S
+# Default-Stop:
+# X-Interactive:     true
+# Short-Description: Set preliminary keymap
+# Description:       Set the console keyboard as early as possible
+#                    so during the file systems checks the administrator
+#                    can interact.  At this stage of the boot process
+#                    only the ASCII symbols are supported.
+### END INIT INFO
+
+set -e
+
+# This script is not used by keyboard-configuration.  It is used
+# jointly by console-setup and console-setup-mini
+
+test -f /bin/setupcon || exit 0
+
+if [ -f /lib/lsb/init-functions ]; then
+    . /lib/lsb/init-functions
+else
+    log_action_begin_msg () {
+	echo -n "$@... "
+    }
+
+    log_action_end_msg () {
+	if [ "$1" -eq 0 ]; then 
+	    echo done.
+	else
+	    echo failed.
+	fi
+    }
+fi
+
+case "$1" in
+    stop)
+        # keyboard-setup isn't a daemon
+        ;;
+    start|force-reload|restart|reload)
+	case `readlink /proc/self/fd/2` in
+	    /dev/tty[0-9]*|/dev/vc/[0-9]*|/dev/console)
+	        log_action_begin_msg "Setting preliminary keymap"
+		if setupcon -k; then
+		    log_action_end_msg 0
+		else
+		    log_action_end_msg $?
+		fi
+		;;
+	    *)
+		exit 0 
+		;;
+	esac
+	;;
+    *)
+        echo 'Usage: /etc/init.d/keyboard-setup {start|reload|restart|force-reload|stop}'
+        exit 1
+        ;;
+esac
+
@@ -0,0 +1,81 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          acpid
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
+# X-Start-Before:    kdm gdm xdm hal
+# X-Stop-After:      kdm gdm xdm hal
+# Default-Start:     2 3 4 5
+# Default-Stop:      
+# Short-Description: Start the Advanced Configuration and Power Interface daemon
+# Description:       Provide a socket for X11, hald and others to multiplex
+#                    kernel ACPI events.
+### END INIT INFO
+
+set -e
+
+ACPID="/usr/sbin/acpid"
+DEFAULTS="/etc/default/acpid"
+
+# Check for daemon presence
+[ -x "$ACPID" ] || exit 0
+
+OPTIONS=""
+MODULES=""
+# Include acpid defaults if available
+[ -r "$DEFAULTS" ] && . "$DEFAULTS"
+
+# Get lsb functions
+. /lib/lsb/init-functions
+
+# As the name says. If the kernel supports modules, it'll try to load
+# the ones listed in "MODULES".
+load_modules() {
+    [ -f /proc/modules ] || return 0
+    if [ "$MODULES" = "all" ]; then
+        MODULES="$(sed -rn 's#^(/lib/modules/[^/]+/)?kernel/(drivers|ubuntu)/acpi/([^/]+/)*(.*)\.ko:.*#\4#p' "/lib/modules/$(uname -r)/modules.dep")"
+    fi
+
+    if [ -z "$MODULES" ]; then
+        return
+    fi
+
+    log_begin_msg "Loading ACPI kernel modules..."
+    # work around a bug in initramfs which leaks this env var Launchpad #291619
+    # and a bug in modprobe --all --quiet which doesn't load all modules and
+    # exits with non-zero exit status Debian #504088
+    unset MODPROBE_OPTIONS
+    modprobe --all --use-blacklist $MODULES 2>/dev/null
+    log_end_msg $?
+}
+
+case "$1" in
+  start)
+    load_modules || true
+    log_begin_msg "Starting ACPI services..."
+    start-stop-daemon --start --quiet --oknodo --exec "$ACPID" -- $OPTIONS
+    log_end_msg $?
+    ;;
+  stop)
+    log_begin_msg "Stopping ACPI services..."
+    start-stop-daemon --stop --quiet --oknodo --retry 2 --exec "$ACPID"
+    log_end_msg $?
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  reload|force-reload) 
+    log_begin_msg "Reloading ACPI services..."
+    start-stop-daemon --stop --signal 1 --exec "$ACPID"
+    log_end_msg $?
+    ;;
+  status)
+    status_of_proc "$ACPID" acpid
+    ;;
+  *)
+    log_success_msg "Usage: /etc/init.d/acpid {start|stop|restart|reload|force-reload|status}"
+    exit 1
+esac
+
@@ -0,0 +1,259 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          kbd
+# Required-Start:    $remote_fs
+# Required-Stop:
+# Default-Start:     S
+# Default-Stop:
+# X-Interactive:     true
+# Description: Set console screen modes and fonts
+# Short-Description:    Prepare console
+### END INIT INFO
+
+# This is the boot script for the `kbd' package.
+# It loads parameters from /etc/kbd/config and maybe loads
+# default font and map.
+# (c) 1997 Yann Dirson
+
+PKG=kbd
+if [ -r /etc/$PKG/config ]; then
+    . /etc/$PKG/config
+fi
+
+if [ -d /etc/$PKG/config.d ]; then
+    for i in `run-parts --list /etc/$PKG/config.d `; do
+       . $i
+    done
+fi
+
+# do some magic with the variables for compatibility with the config
+# file of console-tools
+for vc in '' `set | grep "^.*_vc[0-9][0-9]*="  | sed 's/^.*\(_vc[0-9][0-9]*\)=.*/\1/'`
+do
+    eval [ '"'\${SCREEN_FONT$vc}'"' ] && eval CONSOLE_FONT$vc=\${CONSOLE_FONT$vc:-\${SCREEN_FONT$vc}}
+    eval [ '"'\${SCREEN_FONT_MAP$vc}'"' ] && eval FONT_MAP$vc=\${FONT_MAP$vc:-\${SCREEN_FONT_MAP$vc}}
+    eval [ '"'\${APP_CHARSET_MAP$vc}'"' ] && eval CONSOLE_MAP$vc=\${CONSOLE_MAP$vc:-\${APP_CHARSET_MAP$vc}}
+done
+
+. /lib/lsb/init-functions
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+SETFONT_OPT="-v"
+
+if which setupcon >/dev/null
+then
+    HAVE_SETUPCON=yes
+fi
+
+# set DEVICE_PREFIX depending on devfs/udev
+if [ -d /dev/vc ]; then
+    DEVICE_PREFIX="/dev/vc/"
+else
+    DEVICE_PREFIX="/dev/tty"
+fi
+
+# determine the system charmap
+ENV_FILE=''
+[ -r /etc/environment ] && ENV_FILE="/etc/environment"
+[ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
+[ "$ENV_FILE" ] && CHARMAP=$(set -a && . "$ENV_FILE" && locale charmap)
+if [ "$CHARMAP" = "UTF-8" -a -z "$CONSOLE_MAP" ]
+then
+    UNICODE_MODE=yes
+fi
+
+reset_vga_palette ()
+{
+    if [ -f /proc/fb ]; then
+        # They have a framebuffer device.
+        # That means we have work to do...
+        echo -n "]R"
+    fi
+}
+
+unicode_start_stop ()
+{
+    vc=$1
+    if [ -n "$UNICODE_MODE" -a -z "`eval echo \\$CONSOLE_MAP_vc$vc`" ]; then
+        action=unicode_start
+    else
+        action=unicode_stop
+    fi
+    if [ "${CONSOLE_FONT}" ]; then
+        $action "${CONSOLE_FONT}" < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+    else
+        $action < ${DEVICE_PREFIX}$vc > ${DEVICE_PREFIX}$vc 2> /dev/null || true
+    fi
+}
+
+setup ()
+{
+    # be sure the main program is installed
+    which setfont >/dev/null || return
+
+    VT="no"
+    # If we can't access the console, quit
+    CONSOLE_TYPE=`fgconsole 2>/dev/null` || return
+
+    if [ ! $CONSOLE_TYPE = "serial" ]; then
+        readlink /proc/self/fd/0 | grep -q -e /dev/vc -e '/dev/tty[^p]' -e /dev/console
+        if [ $? -eq 0 ]; then
+            VT="yes"
+            reset_vga_palette
+        fi
+    fi
+
+    [ $VT = "no" ] && return
+
+    # start vcstime
+    if [ "${DO_VCSTIME}" = "yes" ] && which vcstime >/dev/null; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Starting clock on text console"
+        vcstime &
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+
+    if [ -d /etc/init ] && which initctl >/dev/null; then
+	    # Upstart
+	    LIST_CONSOLES=`cd /etc/init; find -name 'tty*.conf' -printf '%f ' | sed -e 's/[^0-9 ]//g'`
+    else
+	    # traditional SysV init
+	    LIST_CONSOLES=`sed -e '/^ *#/d' /etc/inittab | grep -e '\<tty[0-9]*\>' | awk -F: '{printf "%s ", $1}'`
+    fi
+
+    # Global default font+map
+    if [ -z "${HAVE_SETUPCON}" -a "${CONSOLE_FONT}" ]; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up general console font"
+        sfm="${FONT_MAP}" && [ "$sfm" ] && sfm="-u $sfm"
+        acm="${CONSOLE_MAP}" && [ "$acm" ] && acm="-m $acm"
+    
+        # Set for the first 6 VCs (as they are allocated in /etc/inittab)
+        for vc in $LIST_CONSOLES
+        do
+            if ! ( unicode_start_stop $vc \
+                   && setfont -C ${DEVICE_PREFIX}$vc ${SETFONT_OPT} $sfm ${CONSOLE_FONT} $acm )
+            then
+                [ "$VERBOSE" != "no" ] && log_action_end_msg 1
+                break
+            fi
+        done
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+
+    # Default to Unicode mode for new VTs?
+    if [ -f /sys/module/vt/parameters/default_utf8 ]; then
+        if [ -n "$UNICODE_MODE" ]; then
+            echo 1
+        else
+            echo 0
+        fi > /sys/module/vt/parameters/default_utf8
+    fi
+
+    # Per-VC font+sfm
+    PERVC_FONTS="`set | grep "^CONSOLE_FONT_vc[0-9]*="  | tr -d \' `"
+    if [ -z "${HAVE_SETUPCON}" -a "${PERVC_FONTS}" ]; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up per-VC fonts"
+        for font in ${PERVC_FONTS}
+        do
+            # extract VC and FONTNAME info from variable setting
+            vc=`echo $font | cut -b16- | cut -d= -f1`
+            eval font=\$CONSOLE_FONT_vc$vc
+            # eventually find an associated SFM
+            eval sfm=\${FONT_MAP_vc${vc}}
+            [ "$sfm" ] && sfm="-u $sfm"
+            if ! ( unicode_start_stop $vc \
+                   && setfont -C ${DEVICE_PREFIX}$vc ${SETFONT_OPT} $sfm $font )
+            then
+                [ "$VERBOSE" != "no" ] && log_action_end_msg 1
+                break
+            fi
+        done
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+
+
+    # Per-VC ACMs
+    PERVC_ACMS="`set | grep "^CONSOLE_MAP_vc[0-9]*="  | tr -d \' `"
+    if [ -z "${HAVE_SETUPCON}" -a "${PERVC_ACMS}" ]; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting up per-VC ACM's"
+        for acm in ${PERVC_ACMS}
+          do
+          # extract VC and ACM_FONTNAME info from variable setting
+          vc=`echo $acm | cut -b15- | cut -d= -f1`
+          eval acm=\$CONSOLE_MAP_vc$vc
+          if ! setfont -C "${DEVICE_PREFIX}$vc" ${SETFONT_OPT} -m "$acm"; then
+              [ "$VERBOSE" != "no" ] && log_action_end_msg 1
+              break
+          fi
+        done
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+    
+
+    # screensaver stuff
+    setterm_args=""
+    if [ "$BLANK_TIME" ]; then
+        setterm_args="$setterm_args -blank $BLANK_TIME"
+    fi
+    if [ "$BLANK_DPMS" ]; then
+        setterm_args="$setterm_args -powersave $BLANK_DPMS"
+    fi
+    if [ "$POWERDOWN_TIME" ]; then
+        setterm_args="$setterm_args -powerdown $POWERDOWN_TIME"
+    fi
+    if [ "$setterm_args" ]; then
+        setterm $setterm_args 
+    fi
+
+    # Keyboard rate and delay
+    KBDRATE_ARGS=""
+    if [ -n "$KEYBOARD_RATE" ]; then
+        KBDRATE_ARGS="-r $KEYBOARD_RATE"
+    fi
+    if [ -n "$KEYBOARD_DELAY" ]; then
+        KBDRATE_ARGS="$KBDRATE_ARGS -d $KEYBOARD_DELAY"
+    fi
+    if [ -n "$KBDRATE_ARGS" ]; then
+        [ "$VERBOSE" != "no" ] && log_action_begin_msg "Setting keyboard rate and delay"
+        kbdrate -s $KBDRATE_ARGS
+        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
+    fi
+
+    # Inform gpm if present, of potential changes.
+    if [ -f /var/run/gpm.pid ]; then
+        kill -s WINCH `cat /var/run/gpm.pid` 2> /dev/null
+    fi
+
+    # Allow user to remap keys on the console
+    if [ -z "${HAVE_SETUPCON}" -a -r /etc/$PKG/remap ]; then
+        dumpkeys < ${DEVICE_PREFIX}1 | sed -f /etc/$PKG/remap | loadkeys --quiet
+    fi
+
+    # Set LEDS here
+    if [ -n "$LEDS" ]; then
+        for i in $LIST_CONSOLES
+        do
+            setleds -D $LEDS < $DEVICE_PREFIX$i
+        done
+    fi
+}
+
+case "$1" in
+    start|reload|restart|force-reload)
+        if [ -n "$HAVE_SETUPCON" ]
+        then
+                log_action_msg "Setting console screen modes"
+        else
+                log_action_msg "Setting console screen modes and fonts"
+        fi
+        setup
+	[ -z "$HAVE_SETUPCON" ] || log_action_msg "Skipping font and keymap setup (handled by console-setup)"
+        ;;
+    stop)
+        ;;
+    *)
+        setup
+        ;;
+esac
+
+:
+
@@ -26,6 +26,7 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <sys/stat.h>		/* umask(), mkdir() */
+#include <getopt.h>

 #include "finit.h"
 #include "helpers.h"
@@ -33,16 +34,20 @@
 #include "plugin.h"
 #include "svc.h"
 #include "sig.h"
+#include "tty.h"
 #include "lite.h"

-int   debug    = 0;
-int   verbose  = 1;
-char *sdown    = NULL;
-char *network  = NULL;
-char *username = NULL;
-char *hostname = NULL;
-char *rcsd     = NULL;
-
+int   debug     = 0;
+int   verbose   = 1;
+int   runlevel  = 0;		/* Bootstrap */
+int   cfglevel  = RUNLEVEL;	/* Fallback if no configured runlevel */
+int   prevlevel = 0;		/* HALT */
+char *sdown     = NULL;
+char *network   = NULL;
+char *username  = NULL;
+char *hostname  = NULL;
+char *rcsd      = NULL;
+char *console   = NULL;

 static void parse_kernel_cmdline(void)
 {
@@ -63,18 +68,106 @@ static void parse_kernel_cmdline(void)
 	}
 }

+static int usage(int rc)
+{
+	fprintf(stderr, "Usage: %s [OPTIONS] [RUNLEVEL]\n\n"
+		"  -d, --debug          Enable/Disable debug\n"
+		"  -h, --help           This help text\n\n", __progname);
+
+	return rc;
+}
+
+static int client(int argc, char *argv[])
+{
+	int fd;
+	int c;
+	struct option long_options[] = {
+		{"debug", 0, NULL, 'd'},
+		{"help", 0, NULL, 'h'},
+		{NULL, 0, NULL, 0}
+	};
+	struct init_request rq = {
+		.magic = INIT_MAGIC,
+		.cmd = 0
+	};
+
+	while ((c = getopt_long (argc, argv, "h?d", long_options, NULL)) != EOF) {
+		switch(c) {
+		case 'd':
+			rq.cmd = INIT_CMD_DEBUG;
+			break;
+
+		case 'h':
+		case '?':
+			return usage(0);
+		default:
+			return usage(1);
+		}
+	}
+
+	if (!rq.cmd) {
+		if (argc < 2) {
+			fprintf(stderr, "Missing runlevel.\n");
+			return 1;
+		}
+
+		rq.cmd = INIT_CMD_RUNLVL;
+		rq.runlevel = (int)argv[1][0];
+	}
+
+	if (!fexist(FINIT_FIFO)) {
+		fprintf(stderr, "/sbin/init does not support %s!\n", FINIT_FIFO);
+		return 1;
+	}
+
+	fd = open(FINIT_FIFO, O_WRONLY);
+	if (-1 == fd) {
+		perror("Failed opening " FINIT_FIFO);
+		return 1;
+	}
+	write(fd, &rq, sizeof(rq));
+	close(fd);
+
+	return 0;
+}
+
 static int run_loop(void)
 {
+	int delay = DELAY_TTY ?: 1;
+
+	_d("Entering main loop ...");
 	while (1) {
 		svc_monitor();
 		plugin_monitor();
+
+		/* Delayed start of TTYs to let the system stabilize
+		 * after switching runlevels. */
+		if (delay) {
+			if (--delay == 0)
+				tty_runlevel(runlevel);
+			continue;
+		}
 	}

 	return 0;
 }

-int main(int UNUSED(args), char *argv[])
+static void banner(void)
 {
+	delline();
+	echo("Finit version " VERSION " (" WHOAMI ") " __DATE__ " " __TIME__);
+}
+
+int main(int argc, char* argv[])
+{
+	if (getpid() != 1)
+		return client(argc, argv);
+
+	/*
+	 * Hello world.
+	 */
+	banner();
+
 	/*
 	 * Initial setup of signals, ignore all until we're up.
 	 */
@@ -99,17 +192,10 @@ int main(int UNUSED(args), char *argv[])
 	 */
 	parse_kernel_cmdline();

-	cls();
-	echo("finit " VERSION " (built " __DATE__ " " __TIME__ " by " WHOAMI ")");
-
 	/*
 	 * Populate /dev and prepare for runtime events from kernel.
 	 */
-#if defined(USE_UDEV)
-	run_interactive("udevd --daemon", "Populating device tree");
-#elif defined (MDEV)
-	run_interactive(MDEV " -s", "Populating device tree");
-#endif
+	run_interactive(SETUP_DEVFS, "Populating device tree");

 	/*
 	 * Parse configuration file
@@ -121,20 +207,19 @@ int main(int UNUSED(args), char *argv[])
 	 * all services, or service plugins won't have anything to
 	 * hook on to.
 	 */
-	print_desc("", "Loading plugins");
+	print_desc("", "Loading Finit plugins");
 	print_result(plugin_load_all(PLUGIN_PATH));

 	/*
 	 * Mount filesystems
 	 */
-	_d("Mount filesystems in /etc/fstab ...");
-
 #ifdef REMOUNT_ROOTFS_RW
 	run("/bin/mount -n -o remount,rw /");
 #endif
 #ifdef SYSROOT
 	run(SYSROOT, "/", NULL, MS_MOVE, NULL);
 #endif
+
 	_d("Root FS up, calling hooks ...");
 	plugin_run_hooks(HOOK_ROOTFS_UP);

@@ -146,14 +231,17 @@ int main(int UNUSED(args), char *argv[])
 	/* Cleanup stale files, if any still linger on. */
 	run_interactive("rm -rf /tmp/* /var/run/* /var/lock/*", "Cleanup temporary directories");

-	/*
-	 * Base FS up, enable standard SysV init signals
-	 */
+	/* Base FS up, enable standard SysV init signals */
 	sig_setup();

 	_d("Base FS up, calling hooks ...");
 	plugin_run_hooks(HOOK_BASEFS_UP);

+	/*
+	 * Start all bootstrap tasks, no network available!
+	 */
+	svc_bootstrap();
+
 	/*
 	 * Network stuff
 	 */
@@ -169,16 +257,16 @@ int main(int UNUSED(args), char *argv[])
 		run_interactive(network, "Starting networking: %s", network);
 	umask(022);

-	/*
-	 * Hooks that rely on loopback, or basic networking being up.
-	 */
+	/* Hooks that rely on loopback, or basic networking being up. */
 	plugin_run_hooks(HOOK_NETWORK_UP);

 	/*
-	 * Start service monitor framework
+	 * Start all tasks/services in the configured runlevel
 	 */
-	_d("Starting all static services from %s", FINIT_CONF);
-	svc_start_all();
+	svc_runlevel(cfglevel);
+
+	_d("Running svc up hooks ...");
+	plugin_run_hooks(HOOK_SVC_UP);

 	/*
 	 * Run startup scripts in /etc/finit.d/, if any.
@@ -188,19 +276,12 @@ int main(int UNUSED(args), char *argv[])
 		run_parts(rcsd, NULL);
 	}

-	/*
-	 * Hooks that should run at the very end
-	 */
+	/* Hooks that should run at the very end */
 	plugin_run_hooks(HOOK_SYSTEM_UP);

-	/* Start GETTY on console */
-	_d("Starting getty on console ...");
-	run_getty(GETTY, argv);
-
 	/*
 	 * Enter main loop to monior /dev/initctl and services
 	 */
-	_d("Entering main loop ...");
 	return run_loop();
 }

@@ -1,12 +1,38 @@
-# Simple Debian finit.conf
+# Sample Debian finit.conf
+user admin
+host testbed
+
+# Devices to fsck at boot
 check /dev/vda1
+
+# Linux kernel modules to load
+module button
 module evdev
 module loop
 module psmouse
-user admin
-host testbed
+
+# Runlevel to start after bootstrap, runlevel 'S'
+runlevel 2
+
+# Network bringup script
 network service networking start
-service /sbin/klogd -n -- Kernel logging server
-service /sbin/syslogd -n -- Syslog server
-service /usr/sbin/sshd -D -- OpenSSH server
-service /usr/sbin/gdm -- GNOME Display Manager
+
+# Virtual consoles to start getty on
+tty /dev/tty1
+tty /dev/tty2
+tty /dev/tty3
+
+# 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
+#task [S] /etc/init.d/kbd start -- Preparing console
+#run [2] /etc/init.d/networking start -- Start networking
+
+# Services to be monitored and respawned as needed
+service [2345] /sbin/klogd -n -- Kernel logging server
+service [2345] /sbin/syslogd -n -- Syslog server
+service [2345] /usr/sbin/sshd -D -- OpenSSH server
+service [3] /usr/sbin/gdm -- GNOME Display Manager
+
+# By default Finit looks for /etc/finit.d
+# runparts /etc/finit.d
@@ -1,7 +1,7 @@
 /* Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2012  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2008-2013  Joachim Nilsson <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -33,43 +33,66 @@
 #include <sys/stat.h>
 #include <unistd.h>

-/* Distribution configuration */
-
+/* Distribution specific configuration */
 #if defined EMBEDDED_SYSTEM
-# define CONSOLE        "/dev/console"
-# define MDEV           "/sbin/mdev"
-# define GETTY          "/sbin/getty -L 115200 ttyS0 vt100"
+# define CONSOLE                "/dev/console"
+# define SETUP_DEVFS            "/sbin/mdev -s"
+# define GETTY                  "/sbin/getty -L"
+# define GETTY_BUSYBOX
+# define BAUDRATE               115200
+# define RUNLEVEL               2
 #else /* Debian/Ubuntu based distributions */
-# define RANDOMSEED	"/var/lib/urandom/random-seed"
-# define CONSOLE        "/dev/tty1"
-# define GETTY		"/sbin/getty -8 38400 tty1"
+# define CONSOLE                "/dev/tty1"
+# define SETUP_DEVFS            "/sbin/udevd --daemon"
+# define GETTY                  "/sbin/getty -8"
+# define GETTY_AGETTY
+# define BAUDRATE               38400
+# define RUNLEVEL               2
+# define RANDOMSEED             "/var/lib/urandom/random-seed"
 # define REMOUNT_ROOTFS_RW
-# define RUNLEVEL	2
-# define USE_UDEV
-# define USE_MESSAGE_BUS
+# define HAVE_DBUS
 #endif

 #ifndef DEFUSER
-# define DEFUSER "root"
+# define DEFUSER                "root"
 #endif
 #ifndef DEFHOST
-# define DEFHOST "noname"
+# define DEFHOST                "noname"
 #endif

-#define CMD_SIZE  256
-#define LINE_SIZE 1024
-#define BUF_SIZE  4096
-#define USERNAME_SIZE 16
-#define HOSTNAME_SIZE 32
+/* Delay start of GETTY at boot. Must be > 0 */
+#define DELAY_TTY               2

-extern char *sdown;
-extern char *network;
-extern char *hostname;
-extern char *username;
-extern char *rcsd;
+#define CMD_SIZE                256
+#define LINE_SIZE               1024
+#define BUF_SIZE                4096
+
+#define INIT_MAGIC              0x03091969
+#define INIT_CMD_RUNLVL         1
+#define INIT_CMD_DEBUG          2
+
+struct init_request {
+	int	magic;		/* Magic number			*/
+	int	cmd;		/* What kind of request		*/
+	int	runlevel;	/* Runlevel to change to	*/
+	int	sleeptime;	/* Time between TERM and KILL	*/
+	char	data[368];
+};
+
+extern int    runlevel;
+extern int    cfglevel;
+extern int    prevlevel;
+extern char  *sdown;
+extern char  *network;
+extern char  *hostname;
+extern char  *username;
+extern char  *rcsd;
+extern char  *console;
+extern char  *__progname;

 /* conf.c */
-void parse_finit_conf(char *file);
+int  parse_runlevels  (char *runlevels);
+void parse_finit_conf (char *file);

 #endif /* FINIT_H_ */

@@ -250,21 +250,6 @@ char *pid_get_name(pid_t pid, char *name, size_t len)
 	return name;
 }

-
-/**
- * procname_set - Change process name, as seen in process listnings
- * @name: New name of process
- * @args: The process' argv[] vector.
- */
-void procname_set(char *name, char *args[])
-{
-	size_t len = strlen(args[0]) + 1; /* Include terminating '\0' */
-
-	prctl(PR_SET_NAME, name, 0, 0, 0);
-	memset(args[0], 0, len);
-	strlcpy(args[0], name, len);
-}
-
 /**
 * procname_kill - Send a signal to a process group by name.
 * @name: Name of process to send signal to.
@@ -277,7 +262,7 @@ void procname_set(char *name, char *args[])
 * Returns:
 * Number of signals sent, i.e. number of processes who have received the signal.
 */
-int procname_kill (char *name, int signo)
+int procname_kill(char *name, int signo)
 {
 	int result = 0;
 	char path[32], line[64];
@@ -291,17 +276,17 @@ int procname_kill (char *name, int signo)
 		return 0;
 	}

-	while ((entry = readdir (dir)) != NULL) {
+	while ((entry = readdir(dir)) != NULL) {
 		/* Skip non-process entries in /proc */
-		if (!isdigit (*entry->d_name))
+		if (!isdigit(*entry->d_name))
 			continue;

-		snprintf (path, sizeof(path), "/proc/%s/status", entry->d_name);
+		snprintf(path, sizeof(path), "/proc/%s/status", entry->d_name);
 		/* Skip non-readable files (protected?) */
-		if ((fp = fopen (path, "r")) == NULL)
+		if ((fp = fopen(path, "r")) == NULL)
 			continue;

-		if (fgets (line, sizeof (line), fp)) {
+		if (fgets(line, sizeof (line), fp)) {
 			char *pname = line + 6; /* Skip first part of line --> "Name:\t" */

 			if (strncmp(pname, name, strlen(pname) - 1) == 0) {
@@ -324,7 +309,7 @@ int procname_kill (char *name, int signo)
 }


-static int print_uptime(void)
+static int print_timestamp(void)
 {
 #if defined(CONFIG_PRINTK_TIME)
 	FILE * uptimefile;
@@ -347,12 +332,10 @@ static int print_uptime(void)

 void print_desc(char *action, char *desc)
 {
-	const char home[] = "\r\e[K";
 	const char dots[] = " .....................................................................";

-	write(STDERR_FILENO, home, strlen(home));
-
-	print_uptime();
+	delline();
+	print_timestamp();

 	write(STDERR_FILENO, action, strlen(action));
 	write(STDERR_FILENO, desc, strlen(desc));
@@ -369,6 +352,25 @@ int print_result(int fail)
 	return fail;
 }

+/* Wait for process completion, returns status of waitpid(2) syscall */
+int complete(char *cmd, int pid)
+{
+	int status = 0;
+
+	if (waitpid(pid, &status, 0) == -1) {
+		if (errno == EINTR)
+			_e("Caught unblocked signal waiting for %s, aborting.", cmd);
+		else if (errno == ECHILD)
+			_e("Caught SIGCHLD waiting for %s, aborting.", cmd);
+		else
+			_e("Failed starting %s, error %d: %s", cmd, errno, strerror (errno));
+
+		return -1;
+	}
+
+	return status;
+}
+
 int run(char *cmd)
 {
 	int status, result, i = 0;
@@ -383,7 +385,7 @@ int run(char *cmd)

 	/* Split command line into tokens of an argv[] array. */
 	args[i++] = strsep(&arg, "\t ");
-	do {
+	while (arg && i < NUM_ARGS) {
 		/* Handle run("su -c \"dbus-daemon --system\" messagebus");
 		 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
 		if (*arg == '\'' || *arg == '"') {
@@ -398,7 +400,7 @@ int run(char *cmd)
 		} else {
 			args[i++] = strsep(&arg, "\t ");
 		}
-	} while (arg && i < NUM_ARGS);
+	}
 	args[i] = NULL;
 #if 0
 	_e("Splitting: '%s' =>", cmd);
@@ -438,14 +440,8 @@ int run(char *cmd)
 		return -1;
 	}

-	if (waitpid(pid, &status, 0) == -1) {
-		if (errno == EINTR)
-			_e("Caught unblocked signal waiting for %s, aborting.", args[0]);
-		else if (errno == ECHILD)
-			_e("Caught SIGCHLD waiting for %s, aborting.", args[0]);
-		else
-			_e("Failed starting %s, error %d: %s", args[0], errno, strerror (errno));
-
+	status = complete(args[0], pid);
+	if (-1 == status) {
 		if (fp) fclose(fp);
 		free(backup);

@@ -480,7 +476,8 @@ int run_interactive(char *cmd, char *fmt, ...)
 	vsnprintf(line, sizeof(line), fmt, ap);
 	va_end(ap);

-	print_desc("", line);
+	if (fmt)
+		print_desc("", line);
 	if (fp && !debug) {
 		oldout = dup(STDOUT_FILENO);
 		olderr = dup(STDERR_FILENO);
@@ -492,7 +489,8 @@ int run_interactive(char *cmd, char *fmt, ...)
 		dup2(oldout, STDOUT_FILENO);
 		dup2(olderr, STDERR_FILENO);
 	}
-	print_result(status);
+	if (fmt)
+		print_result(status);
 	if (fp && !debug) {
 		size_t len, written;

@@ -507,7 +505,7 @@ int run_interactive(char *cmd, char *fmt, ...)
 	return status;
 }

-pid_t run_getty(char *cmd, char *argv[])
+pid_t run_getty(char *cmd, char *args[], int console)
 {
 	pid_t pid = fork();

@@ -517,47 +515,49 @@ pid_t run_getty(char *cmd, char *argv[])
 		sigset_t nmask;
 		struct sigaction sa;

-		/* Detach from initial controlling TTY */
-		vhangup();
+		if (console) {
+			/* Detach from initial controlling TTY */
+			vhangup();

-		close(2);
-		close(1);
-		close(0);
+			close(2);
+			close(1);
+			close(0);

-		/* Attach TTY to console */
-		if (open(CONSOLE, O_RDWR) != 0)
-			exit(1);
+			/* Attach TTY to console */
+			if (open(CONSOLE, O_RDWR) != 0)
+				exit(1);

+			dup2(0, STDIN_FILENO);
+			dup2(0, STDOUT_FILENO);
+			dup2(0, STDERR_FILENO);
+
+			prctl(PR_SET_NAME, "console", 0, 0, 0);
+		}
 		sigemptyset(&nmask);
 		sigaddset(&nmask, SIGCHLD);
 		sigprocmask(SIG_UNBLOCK, &nmask, NULL);

 		/* Reset signal handlers that were set by the parent process */
-                for (i = 1; i < NSIG; i++)
+		for (i = 1; i < NSIG; i++)
 			DFLSIG(sa, i, 0);

-		dup2(0, STDIN_FILENO);
-		dup2(0, STDOUT_FILENO);
-		dup2(0, STDERR_FILENO);
-
-		procname_set("console", argv);
-
 		while (!fexist(SYNC_SHUTDOWN)) {
-			static const char msg[] = "\nPlease press Enter to activate this console. ";
+			static const char msg[] = "\nPlease press Enter to activate this console.";

 			if (fexist(SYNC_STOPPED)) {
 				sleep(1);
 				continue;
 			}

-			i = write(STDERR_FILENO, msg, sizeof(msg) - 1);
-			while (read(STDIN_FILENO, &c, 1) == 1 && c != '\n')
-				continue;
-
+			if (console) {
+				i = write(STDERR_FILENO, msg, sizeof(msg));
+				while (read(STDIN_FILENO, &c, 1) == 1 && c != '\n')
+					continue;
+			}
 			if (fexist(SYNC_STOPPED))
 				continue;

-			run(cmd);
+			execv(cmd, args);
 		}

 		exit(0);
@@ -649,34 +649,41 @@ int getgroup(char *group)
 * Other convenience functions
 */

-void cls(void)
-{
-	static const char cls[] = "\e[2J\e[1;1H";
-
-	if (verbose)
-		fprintf (stderr, "%s", cls);
-}
-
 void chomp(char *str)
 {
-	char *x;
+	char *x = strrchr(str, 0x0a);

-	if ((x = strchr((str), 0x0a)) != NULL)
+	if (x)
 		*x = 0;
 }

+/* Signal safe sleep ... we get a lot of SIGCHLD at reboot */
+void do_sleep(unsigned int sec)
+{
+	while ((sec = sleep(sec)))
+		;
+}
+
 void set_hostname(char *hostname)
 {
 	FILE *fp;

 	_d("Set hostname: %s", hostname);
 	if ((fp = fopen("/etc/hostname", "r")) != NULL) {
-		fgets(hostname, HOSTNAME_SIZE, fp);
+		struct stat st;
+
+		fstat(fileno(fp), &st);
+		hostname = realloc(hostname, st.st_size);
+		if (!hostname)
+			return;
+
+		fgets(hostname, st.st_size, fp);
 		chomp(hostname);
 		fclose(fp);
 	}

-	sethostname(hostname, strlen(hostname));
+	if (hostname)
+		sethostname(hostname, strlen(hostname));
 }

 /**
@@ -56,16 +56,32 @@
 #ifndef UNUSED
 #define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
 #endif
+/* Esc[2JEsc[1;1H          Clear screen and move cursor to 1,1 (upper left) pos. */
+#define clrscr()           fputs("\e[2J\e[1;1H", stderr)
+/* Esc[K                   Erases from the current cursor position to the end of the current line. */
+#define clreol()           fputs("\e[K", stderr)
+/* Esc[2K                  Erases the entire current line. */
+#define delline()          fputs("\e[2K", stderr)
+/* Esc[Line;ColumnH        Moves the cursor to the specified position (coordinates) */
+#define gotoxy(x,y)        fprintf(stderr, "\e[%d;%dH", y, x)
+/* Esc[?25l (lower case L) Hide Cursor */
+#define hidecursor()       fputs("\e[?25l", stderr)
+/* Esc[?25h (lower case H) Show Cursor */
+#define showcursor()       fputs("\e[?25h", stderr)

-#define echo(fmt, args...) do { if (verbose) { fprintf(stderr,                    fmt "\n", ##args); } } while (0)
-#define   _d(fmt, args...) do { if (debug)   { fprintf(stderr, "finit:%s:%s() - " fmt "\n", __FILE__, __func__, ##args); } } while (0)
-#define   _e(fmt, args...) do {                fprintf(stderr, "finit:%s:%s() - " fmt "\n", __FILE__, __func__, ##args); } while (0)
-#define  _pe(fmt, args...) do {                fprintf(stderr, "finit:%s:%s() - " fmt ". Error %d: %s\n", __FILE__, __func__, ##args, errno, strerror(errno)); } while (0)
+#define echo(fmt, args...) do {              fprintf(stderr,                    fmt "\n", ##args); } while (0)
+#define   _d(fmt, args...) do { if (debug) { fprintf(stderr, "finit:%s:%s() - " fmt "\n", __FILE__, __func__, ##args); } } while (0)
+#define   _e(fmt, args...) do {              fprintf(stderr, "finit:%s:%s() - " fmt "\n", __FILE__, __func__, ##args); } while (0)
+#define  _pe(fmt, args...) do {              fprintf(stderr, "finit:%s:%s() - " fmt ". Error %d: %s\n", __FILE__, __func__, ##args, errno, strerror(errno)); } while (0)
+
+#define ISSET(a,i)   ((a & (1 << (i)) ? 1 : 0))
+#define SETBIT(a,i)  (a |= (1 << (i)))
+#define CLRBIT(a,i)  (a &= ~(1 << (i)))

 extern int debug;
 extern int verbose;

-int	makepath	(char *path);
+int     makepath        (char *path);
 void    ifconfig        (char *ifname, char *addr, char *mask, int up);

 pid_t   pidfile_read    (char *pidfile);
@@ -77,22 +93,20 @@ char   *pid_get_name    (pid_t pid, char *name, size_t len);
 void    procname_set    (char *name, char *args[]);
 int     procname_kill   (char *name, int signo);

-void    print_desc     (char *action, char *desc);
+void    print_desc      (char *action, char *desc);
 int     print_result    (int fail);
 int     start_process   (char *cmd, char *args[], int console);
-void    cls             (void);
-void	chomp		(char *str);
+void    chomp           (char *str);
+void    do_sleep        (unsigned int sec);
 int     getuser         (char *username);
-int	getgroup	(char *group);
+int     getgroup        (char *group);
 void    set_hostname    (char *hostname);

+int     complete        (char *cmd, int pid);
 int     run             (char *cmd);
 int     run_interactive (char *cmd, char *fmt, ...);
-pid_t   run_getty       (char *cmd, char *argv[]);
-int	run_parts	(char *dir, char *cmd);
-
-/* strlcpy.c */
-size_t strlcpy(char *dst, const char *src, size_t siz);
+pid_t   run_getty       (char *cmd, char *args[], int console);
+int     run_parts       (char *dir, char *cmd);

 #endif /* FINIT_HELPERS_H_ */

@@ -28,6 +28,7 @@ include  ../common.mk
 CFLAGS     += -fPIC
 HEADERS     = lite.h
 OBJS       := copyfile.o dir.o fexist.o fisdir.o fmode.o rsync.o
+OBJS       += strlcpy.o strlcat.o strtonum.o
 DEPS       := $(addprefix ., $(OBJS:.o=.d))

 VER         = 0
@@ -179,6 +179,7 @@ int copy_filep(FILE *src, FILE *dst)
 		return errno;

 	while (1) {
+      errno = 0;
 		if (!fgets(buf, BUFSIZ, src)) {
 			if (errno == EINTR) {
 				clearerr(src);
@@ -94,7 +94,7 @@ int dir(const char *dir, const char *type, int (*filter) (const char *file), cha
 	n = scandir(dir, &namelist, matcher, alphasort);
 	if (n < 0) {
 		perror("scandir");
-	} else {
+	} else if (n > 0) {
 		files = (char **)malloc(n * sizeof(char *));
 		for (i = 0; i < n; i++) {
 			if (files) {
@@ -109,11 +109,12 @@ int dir(const char *dir, const char *type, int (*filter) (const char *file), cha
 			}
 			free(namelist[i]);
 		}
-		free(namelist);
+		if (num)
+			*list = files;
 	}

-	if (num)
-		*list = files;
+	if (namelist)
+		free(namelist);

 	return num;
 }
@@ -42,6 +42,16 @@ int     copy_filep (FILE *src, FILE *dst);
 int     dir        (const char *dir, const char *type, int (*filter) (const char *file), char ***list, int strip);
 int     rsync      (char *src, char *dst, int delete, int (*filter) (const char *file));

+#ifndef strlcpy
+size_t  strlcpy    (char *dst, const char *src, size_t siz);
+#endif
+#ifndef strlcat
+size_t  strlcat    (char *dst, const char *src, size_t siz);
+#endif
+#ifndef strtonum
+long long strtonum (const char *numstr, long long minval, long long maxval, const char **errstrp);
+#endif
+
 static inline int fisslashdir(char *dir)
 {
   if (!dir)             return 0;
@@ -62,7 +62,12 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 	{
 		errno = 0;
 		copyfile(src, dst, 0);
-		if (errno) result++;
+		if (errno) {
+			if (errno == EEXIST)
+				errno = 0;
+			else
+				result++;
+		}
 	}

 	if (!fisdir(dst))
@@ -127,8 +132,12 @@ int rsync(char *src, char *dst, int delete, int (*filter) (const char *file))
 static int makedir(char *buf, size_t buf_len, char *dir, char *name, mode_t mode)
 {
 	snprintf(buf, buf_len, "%s%s%s/", dir, fisslashdir(dir) ? "" : "/", name);
-	if (mkdir(buf, mode))
-		return 1;
+	if (mkdir(buf, mode)) {
+		if (EEXIST != errno)
+			return 1;
+
+		errno = 0;
+	}

 	return 0;
 }
@@ -0,0 +1,66 @@
+/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+#ifndef strlcat
+/*
+ * Appends src to string dst of size siz (unlike strncat, siz is the
+ * full size of dst, not space left).  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
+ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
+ * If retval >= siz, truncation occurred.
+ */
+size_t
+strlcat(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end */
+	while (n-- != 0 && *d != '\0')
+		d++;
+	dlen = d - dst;
+	n = siz - dlen;
+
+	if (n == 0)
+		return(dlen + strlen(s));
+	while (*s != '\0') {
+		if (n != 1) {
+			*d++ = *s;
+			n--;
+		}
+		s++;
+	}
+	*d = '\0';
+
+	return(dlen + (s - src));	/* count does not include NUL */
+}
+#endif
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  c-file-style: "bsd"
+ * End:
+ */
+
+
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <string.h>

+#ifndef strlcpy
 /*
 * Copy src to string dst of size siz.  At most siz-1 characters
 * will be copied.  Always NUL terminates (unless siz == 0).
@@ -50,6 +51,8 @@ strlcpy(char *dst, const char *src, size_t siz)
 	return(s - src - 1);	/* count does not include NUL */
 }

+#endif
+
 /**
 * Local Variables:
 *  version-control: t
@@ -0,0 +1,67 @@
+/*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
+
+/*
+ * Copyright (c) 2004 Ted Unangst and Todd Miller
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <errno.h>
+#include <limits.h>
+#include <stdlib.h>
+
+#ifndef strtonum
+#define INVALID 	1
+#define TOOSMALL 	2
+#define TOOLARGE 	3
+
+long long
+strtonum(const char *numstr, long long minval, long long maxval,
+    const char **errstrp)
+{
+	long long ll = 0;
+	char *ep;
+	int error = 0;
+	struct errval {
+		const char *errstr;
+		int err;
+	} ev[4] = {
+		{ NULL,		0 },
+		{ "invalid",	EINVAL },
+		{ "too small",	ERANGE },
+		{ "too large",	ERANGE },
+	};
+
+	ev[0].err = errno;
+	errno = 0;
+	if (minval > maxval)
+		error = INVALID;
+	else {
+		ll = strtoll(numstr, &ep, 10);
+		if (numstr == ep || *ep != '\0')
+			error = INVALID;
+		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
+			error = TOOSMALL;
+		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
+			error = TOOLARGE;
+	}
+	if (errstrp != NULL)
+		*errstrp = ev[error].errstr;
+	errno = ev[error].err;
+	if (error)
+		ll = 0;
+
+	return (ll);
+}
+#endif
@@ -124,9 +124,9 @@ int plugin_unregister(plugin_t *plugin)
 }


+//		_d("Comparing %s against plugin %s", str, p->name);
 #define SEARCH_PLUGIN(str)						\
 	PLUGIN_ITERATOR(p, tmp) {					\
-		_d("Comparing %s against plugin %s", str, p->name);	\
 		if (!strcmp(p->name, str))				\
 			return p;					\
 	}
@@ -189,15 +189,20 @@ void plugin_run_hooks(hook_point_t no)
 }

 /* Generic libev I/O callback, looks up correct plugin and calls its callback */
-static void generic_io_cb(int fd, int events)
+static void generic_io_cb(struct pollfd *io)
 {
 	plugin_t *p, *tmp;

 	/* Find matching plugin, pick first matching fd */
 	PLUGIN_ITERATOR(p, tmp) {
-		if (is_io_plugin(p) && p->io.fd == fd) {
+		if (is_io_plugin(p) && p->io.fd == io->fd) {
 			_d("Calling I/O %s from runloop...", basename(p->name));
-			p->io.cb(p->io.arg, fd, events);
+			p->io.cb(p->io.arg, io->fd, io->events);
+
+			/* Update fd, may be changed by plugin callback, e.g., if FIFO */
+			io->fd      = p->io.fd;
+			io->events  = p->io.flags;
+			io->revents = 0;
 			break;
 		}
 	}
@@ -221,7 +226,7 @@ void plugin_monitor(void)
 		/* Traverse all I/O fds and run callbacks */
 		for (i = 0; i < num_fds; i++) {
 			if (fds[i].revents)
-				generic_io_cb(fds[i].fd, fds[i].revents);
+				generic_io_cb(&fds[i]);
 		}

 		break;
@@ -300,9 +305,9 @@ static void check_plugin_depends(plugin_t *plugin)
 	int i;

 	for (i = 0; i < PLUGIN_DEP_MAX && plugin->depends[i]; i++) {
-		_d("Plugin %s depends on %s ...", plugin->name, plugin->depends[i]);
+//		_d("Plugin %s depends on %s ...", plugin->name, plugin->depends[i]);
 		if (plugin_find(plugin->depends[i])) {
-			_d("OK plugin %s was already loaded.", plugin->depends[i]);
+//			_d("OK plugin %s was already loaded.", plugin->depends[i]);
 			continue;
 		}

@@ -4,8 +4,9 @@ CPPFLAGS   += -I..
 LDFLAGS    := $(filter-out -rdynamic, $(LDFLAGS))
 LDFLAGS    += -shared
 PLUGINS    ?= initctl.so alsa-utils.so bootmisc.so dbus.so hwclock.so \
-	      resolvconf.so urandom.so x11-common.so
+	      resolvconf.so urandom.so x11-common.so tty.so
 DEPS        = $(addprefix .,$(PLUGINS:.so=.d))
+TOPDIR     ?= $(shell pwd)

 include ../common.mk

@@ -27,7 +27,7 @@

 static void setup(void *UNUSED(arg))
 {
-#ifdef USE_MESSAGE_BUS
+#ifdef HAVE_DBUS
 	_d("Starting D-Bus ...");
 	mkdir("/var/run/dbus", 0755);
 	mkdir("/var/lock/subsys/messagebus", 0755);
@@ -27,82 +27,106 @@
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>		/* read() */
+#include <sys/stat.h>

 #include "helpers.h"
 #include "plugin.h"
 #include "sig.h"
+#include "finit.h"

-#define INIT_MAGIC		0x03091969
-#define INIT_CMD_RUNLVL		1
+static void parse(void *arg, int fd, int events);

-struct init_request {
-	int	magic;		/* Magic number			*/
-	int	cmd;		/* What kind of request		*/
-	int	runlevel;	/* Runlevel to change to	*/
-	int	sleeptime;	/* Time between TERM and KILL	*/
-	char	data[368];
+static plugin_t plugin = {
+	.io = {
+		.cb    = parse,
+		.flags = PLUGIN_IO_READ,
+	},
 };

+static void fifo_open(void)
+{
+	plugin.io.fd = open(FINIT_FIFO, O_RDONLY | O_NONBLOCK);
+	if (-1 == plugin.io.fd) {
+		_e("Failed opening %s FIFO, error %d: %s", FINIT_FIFO, errno, strerror(errno));
+		return;
+	}
+}
+
 /* Standard reboot/shutdown utilities talk to init using /dev/initctl.
 * We should check if the fifo was recreated and reopen it.
 */
-static void read_initctl(void *UNUSED(arg), int fd, int UNUSED(events))
+static void parse(void *UNUSED(arg), int fd, int UNUSED(events))
 {
-	struct init_request request;
+	struct init_request rq;

 	_d("Receiving request on %s...", FINIT_FIFO);
 	while (1) {
-		ssize_t len = read(fd, &request, sizeof(request));
+		ssize_t len = read(fd, &rq, sizeof(rq));

-		if (-1 == len) {
-			_d("Error %d", errno);
-			break;	/* Probably EAGAIN */
+		if (len <= 0) {
+			if (-1 == len) {
+				if (EINTR == errno)
+					continue;
+
+				if (EAGAIN == errno)
+					break;
+
+				_e("Failed reading initctl request, error %d: %s", errno, strerror(errno));
+			}
+			break;
 		}

-		if (request.magic != INIT_MAGIC)
-			continue;
+		if (rq.magic != INIT_MAGIC || len != sizeof(rq)) {
+			_e("Invalid initctl request.");
+			break;
+		}

 		_d("Magic OK...");
-		if (request.cmd == INIT_CMD_RUNLVL) {
-			switch (request.runlevel) {
+		if (rq.cmd == INIT_CMD_RUNLVL) {
+			switch (rq.runlevel) {
 			case '0':
 				_d("Halting system (SIGUSR2)");
 				do_shutdown(SIGUSR2);
 				break;

+			case 's':
+			case 'S':
+				_d("Cannot enter bootstrap after boot ...");
+				rq.runlevel = '1';
+				/* Fall through to regular processing */
+
+			case '1'...'5':
+			case '7'...'9':
+				_d("Setting new runlevel %c", rq.runlevel);
+				svc_runlevel(rq.runlevel - '0');
+				break;
+
 			case '6':
 				_d("Rebooting system (SIGUSR1)");
 				do_shutdown(SIGUSR1);
 				break;

 			default:
-				_d("Unsupported runlevel: %d", request.runlevel);
+				_d("Unsupported runlevel: %d", rq.runlevel);
 				break;
 			}
+		} else if (rq.cmd == INIT_CMD_DEBUG) {
+			debug = !debug;
 		} else {
-			_d("Unsupported cmd: %d", request.cmd);
+			_d("Unsupported cmd: %d", rq.cmd);
 		}
 	}
-}

-static plugin_t plugin = {
-	.io = {
-		.cb    = read_initctl,
-		.flags = PLUGIN_IO_READ,
-	},
-};
+	close(fd);
+	fifo_open();
+}

 PLUGIN_INIT(plugin_init)
 {
 	_d("Setting up %s", FINIT_FIFO);
 	mkfifo(FINIT_FIFO, 0600);

-	plugin.io.fd = open(FINIT_FIFO, O_RDONLY | O_NONBLOCK);
-	if (-1 == plugin.io.fd) {
-		_e("Failed opening %s FIFO, error %d: %s", FINIT_FIFO, errno, strerror(errno));
-		return;
-	}
-
+	fifo_open();
 	plugin_register(&plugin);
 }

@@ -0,0 +1,94 @@
+/* Optional TTY Watcher, used to catch new TTYs that are discovered, e.g., USB
+ *
+ * Copyright (c) 2013  Mattias Walström <lazzer@gmail.com>
+ * Copyright (c) 2013  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <errno.h>
+#include <fcntl.h>		/* O_RDONLY et al */
+#include <unistd.h>		/* read() */
+#include <sys/inotify.h>
+#include <sys/stat.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+#include "tty.h"
+
+static void watcher(void *arg, int fd, int events);
+
+static plugin_t plugin = {
+	.io = {
+		.cb    = watcher,
+		.flags = PLUGIN_IO_READ,
+	},
+};
+
+static void setup(void)
+{
+	plugin.io.fd = inotify_init1(IN_NONBLOCK);
+	if (-1 == plugin.io.fd || inotify_add_watch(plugin.io.fd, "/dev", IN_CREATE | IN_DELETE) < 0)
+		_e("Failed starting TTY watcher: %s", strerror(errno));
+}
+
+static void watcher(void *UNUSED(arg), int fd, int UNUSED(events))
+{
+	int len = 0;
+	char buf[EVENT_SIZE], name[42];
+	tty_node_t *entry;
+	struct inotify_event *notified = (struct inotify_event *)buf;
+
+	while ((len = read(fd, buf, sizeof(buf)))) {
+		if (-1 == len) {
+			if (errno == EINTR)
+				continue;
+			break;
+		}
+
+		snprintf(name, sizeof(name), "/dev/%s", notified->name);
+		entry = tty_find(name);
+		if (entry && tty_enabled(&entry->data, runlevel)) {
+			if (notified->mask & IN_CREATE)
+				tty_start(&entry->data);
+			else if (entry->data.pid)
+				tty_stop(&entry->data);
+		}
+	}
+}
+
+PLUGIN_INIT(plugin_init)
+{
+	setup();
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -1,7 +1,7 @@
 /* Private header file for main finit daemon, not for plugins
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2012  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2008-2013  Joachim Nilsson <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@
 #include "svc.h"
 #include "plugin.h"

-void      svc_start_all    (void);
+void      svc_bootstrap    (void);
 void      svc_monitor      (void);

 void      plugin_run_hooks (hook_point_t no);
@@ -49,7 +49,6 @@

 static int stopped = 0;

-
 void do_shutdown (int sig)
 {
 	touch(SYNC_SHUTDOWN);
@@ -57,12 +56,15 @@ void do_shutdown (int sig)
 	if (sdown)
 		run_interactive(sdown, "Calling shutdown hook: %s", sdown);

+	/* Call all shutdown hooks before rebooting... */
+	plugin_run_hooks(HOOK_SHUTDOWN);
+
+	/* Here is where we signal watchdogd to do a forced reset for us */
 	_d("Sending SIGTERM to all processes.");
 	kill(-1, SIGTERM);

-	sleep(1);
-	/* Call all shutdown hooks, this is the last call before rebooting... */
-	plugin_run_hooks(HOOK_SHUTDOWN);
+	/* Wait for WDT to timeout, should be no more than ~1 sec. */
+	do_sleep(2);

 	_d("Sending SIGKILL to remaining processes.");
 	kill(-1, SIGKILL);
@@ -108,7 +110,7 @@ static void sigstop_handler(int sig, siginfo_t *info, void *UNUSED(ctx))
 	_d("Received SIGSTOP(%d) from %s (PID %d)",
 	   sig, pid_get_name(info->si_pid, NULL, 0), info->si_pid);
 	touch(SYNC_STOPPED);
-	stopped ++;
+	stopped++;
 }
 static void sigcont_handler(int sig, siginfo_t *info, void *UNUSED(ctx))
 {
@@ -1,7 +1,7 @@
-/* Finit service monitor and heneric API for managing svc_t structures
+/* Finit service monitor, task starter and generic API for managing svc_t
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
- * Copyright (c) 2008-2012  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2008-2013  Joachim Nilsson <troglobit@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -24,11 +24,13 @@

 #include <string.h>
 #include <sys/wait.h>
+#include <utmp.h>

 #include "finit.h"
 #include "helpers.h"
 #include "private.h"
 #include "sig.h"
+#include "tty.h"
 #include "lite.h"
 #include "svc.h"

@@ -122,25 +124,128 @@ svc_t *svc_iterator(int restart)
 }

 /**
- * svc_register - Register a non-backgrounding service to be monitored
+ * svc_bootstrap - Start bootstrap services and tasks
+ *
+ * System startup, runlevel S, where only services, tasks and
+ * run commands absolutely essential to bootstrap are located.
+ */
+void svc_bootstrap(void)
+{
+	svc_t *svc;
+	svc_cmd_t cmd;
+
+	_d("Bootstrapping all services in runlevel S from %s", FINIT_CONF);
+	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
+		cmd = svc_enabled(svc, 0, NULL);
+		if (SVC_START == cmd  || (SVC_RELOAD == cmd))
+			svc_start(svc);
+	}
+}
+
+static void utmp_save(int pre, int now)
+{
+   struct utmp utent;
+
+   int encode(int lvl)
+   {
+	   if (!lvl) return 0;
+	   return lvl + '0';
+   }
+
+   utent.ut_type  = RUN_LVL;
+   utent.ut_pid   = (encode(pre) << 8) | (encode(now) & 0xFF);
+   strlcpy(utent.ut_user, "runlevel", sizeof(utent.ut_user));
+
+   setutent();
+   pututline(&utent);
+   endutent();
+}
+
+/**
+ * svc_runlevel - Change to a new runlevel
+ * @newlevel: New runlevel to activate
+ *
+ * Stops all services not in @newlevel and starts, or lets continue to run,
+ * those in @newlevel.  Also updates @prevlevel and active @runlevel.
+ */
+void svc_runlevel(int newlevel)
+{
+	svc_t *svc;
+
+	if (runlevel == newlevel)
+		return;
+
+	if (newlevel < 0 || newlevel > 9)
+		return;
+
+	prevlevel = runlevel;
+	runlevel  = newlevel;
+	utmp_save(prevlevel, newlevel);
+
+	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
+		int run = svc_enabled(svc, 0, NULL);
+
+		if (svc->pid) {
+			if (run == SVC_STOP)
+				svc_stop(svc);
+		} else {
+			if (run == SVC_START)
+				svc_start(svc);
+		}
+	}
+
+	if (0 == runlevel) {
+		do_shutdown(SIGUSR2);
+		return;
+	}
+	if (6 == runlevel) {
+		do_shutdown(SIGUSR1);
+		return;
+	}
+
+	if (runlevel == 1)
+		touch("/etc/nologin");	/* Disable login in single-user mode */
+	else
+		remove("/etc/nologin");
+
+	if (0 != prevlevel)
+		tty_runlevel(runlevel);
+}
+
+/**
+ * svc_register - Register service, task or run commands
+ * @type:     %SVC_CMD_SERVICE(0), %SVC_CMD_TASK(1), %SVC_CMD_RUN(2)
 * @line:     A complete command line with -- separated description text
 * @username: Optional username to run service as, or %NULL to run as root
 *
- * Actually, the @line can optionally start with a username, denoted by
- * an @ character. Like this:
+ * 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
+ * service and task commands do.
 *
- *   "service [@username] /path/to/daemon -- Description text"
+ * The @line can optionally start with a username, denoted by an @
+ * character. Like this:
 *
- * The [] brackets means the argument is optional. If the username is
- * left out the daemon is started as root.
+ *   "service @username [!0-6,S] /path/to/daemon arg -- Description text"
+ *   "task @username [!0-6,S] /path/to/task arg -- Description text"
+ *   "run  @username [!0-6,S] /path/to/cmd arg -- Description text"
+ *
+ * If the username is left out the command is started as root.
+
+ * The [] brackets are there to denote the allowed runlevels. Allowed
+ * runlevels mimic that of SysV init with the addition of the 'S'
+ * runlevel, which is only run once at startup. It can be seen as the
+ * system bootstrap. If a task or run command is listed in more than the
+ * [S] runlevel they will be called when changing runlevel.
 *
 * Returns:
 * POSIX OK(0) on success, or non-zero errno exit status on failure.
 */
-int svc_register(char *line, char *username)
+int svc_register(int type, char *line, char *username)
 {
 	int i = 0;
-	char *cmd, *desc;
+	char *cmd, *desc, *runlevels = NULL;
 	svc_t *svc;

 	if (!line) {
@@ -159,8 +264,13 @@ int svc_register(char *line, char *username)
 		return errno = ENOENT;
 	}

-	if (cmd[0] == '@') {	/* @username */
-		username = &cmd[1];
+	while (cmd) {
+		if (cmd[0] == '@')	/* @username */
+			username = &cmd[1];
+		else if (cmd[0] == '[')	/* [runlevels] */
+			runlevels = &cmd[0];
+		else
+			break;

 		/* Check if valid command follows... */
 		cmd = strtok(NULL, " ");
@@ -170,21 +280,28 @@ int svc_register(char *line, char *username)

 	svc = svc_new();
 	if (!svc) {
-		_e("Out of memorym, cannot register service %s", cmd);
+		_e("Out of memory, cannot register service %s", cmd);
 		return errno = ENOMEM;
 	}

+	svc->type = type;
+
 	if (desc)
 		strlcpy(svc->desc, desc + 3, sizeof(svc->desc));
+
 	if (username)
 		strlcpy(svc->username, username, sizeof(svc->username));
-	strlcpy(svc->cmd, cmd, sizeof(svc->cmd));
-	strlcpy(svc->args[i++], cmd, sizeof(svc->args[0]));

+	strlcpy(svc->cmd, cmd, sizeof(svc->cmd));
+
+	strlcpy(svc->args[i++], cmd, sizeof(svc->args[0]));
 	while ((cmd = strtok(NULL, " ")))
 		strlcpy(svc->args[i++], cmd, sizeof(svc->args[0]));
 	svc->args[i][0] = 0;

+	svc->runlevels = parse_runlevels(runlevels);
+	_d("Service %s runlevel 0x%2x", svc->cmd, svc->runlevels);
+
 	return 0;
 }

@@ -210,6 +327,9 @@ svc_cmd_t svc_enabled(svc_t *svc, int event, void *arg)
 		return SVC_STOP;
 	}

+	if (!ISSET(svc->runlevels, runlevel))
+		return SVC_STOP;
+
 	/* Is there a service plugin registered? */
 	if (svc->cb)
 		return svc->cb(svc, event, arg);
@@ -241,13 +361,19 @@ void svc_monitor(void)
 	if (is_norespawn())
 		return;

-	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
-		char *name = basename(svc->cmd);
+	if (tty_respawn(lost))
+		return;

+	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
 		if (lost != svc->pid)
 			continue;

-		_d("Ouch, lost pid %d - %s(%d)", lost, name, svc->pid);
+		if (SVC_CMD_SERVICE != svc->type) {
+			svc->pid = 0;
+			continue;
+		}
+
+		_d("Ouch, lost pid %d - %s(%d)", lost, basename(svc->cmd), svc->pid);

 		/* No longer running, update books. */
 		svc->pid = 0;
@@ -258,12 +384,14 @@ void svc_monitor(void)
 		}

 		/* Cleanup any lingering or semi-restarting tasks before respawning */
-		_d("Sending SIGTERM to service group %s", name);
-		procname_kill(name, SIGTERM);
+		_d("Sending SIGTERM to service group %s", basename(svc->cmd));
+		procname_kill(basename(svc->cmd), SIGTERM);

 		/* Restarting lost service. */
-		if (svc_enabled(svc, 0, NULL))
+		if (svc_enabled(svc, 0, NULL)) {
+			svc->restart_counter++;
 			svc_start(svc);
+		}

 		break;
 	}
@@ -295,7 +423,9 @@ int svc_start(svc_t *svc)
 	if (is_norespawn())
 		return 0;

-	if (!respawn)
+	if (SVC_CMD_SERVICE != svc->type)
+		print_desc("", svc->desc);
+	else if (!respawn)
 		print_desc("Starting ", svc->desc);

        /* Block sigchild while forking.  */
@@ -331,7 +461,7 @@ int svc_start(svc_t *svc)
 			int fd;
 			char buf[CMD_SIZE] = "";

-			fd = open (CONSOLE, O_WRONLY | O_APPEND);
+			fd = open(CONSOLE, O_WRONLY | O_APPEND);
 			if (-1 != fd) {
 				dup2(STDOUT_FILENO, fd);
 				dup2(STDERR_FILENO, fd);
@@ -355,7 +485,9 @@ int svc_start(svc_t *svc)
 	}
 	svc->pid = pid;

-	if (!respawn)
+	if (SVC_CMD_RUN == svc->type)
+		print_result(WEXITSTATUS(complete(svc->cmd, pid)));
+	else if (!respawn)
 		print_result(svc->pid > 1 ? 0 : 1);

 	return 0;
@@ -383,14 +515,21 @@ int svc_stop(svc_t *svc)
 	if (svc->pid <= 1) {
 		_d("Bad PID %d for %s, SIGTERM", svc->pid, svc->desc);
 		svc->pid = 0;
+		svc->restart_counter = 0;
 		return 1;
 	}

-	print_desc("Stopping ", svc->desc);
+	if (SVC_CMD_SERVICE != svc->type)
+		return 0;
+
+	if (runlevel != 1)
+		print_desc("Stopping ", svc->desc);
 	_d("Sending SIGTERM to pid:%d name:'%s'", svc->pid, pid_get_name(svc->pid, NULL, 0));
 	res = kill(svc->pid, SIGTERM);
-	print_result(res);
+	if (runlevel != 1)
+		print_result(res);
 	svc->pid = 0;
+	svc->restart_counter = 0;

 	return res;
 }
@@ -416,24 +555,6 @@ int svc_reload(svc_t *svc)
 	return kill(svc->pid, SIGHUP);
 }

-void svc_start_all(void)
-{
-	svc_t *svc;
-	svc_cmd_t cmd;
-
-	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
-		cmd = svc_enabled(svc, 0, NULL);
-		if (SVC_START == cmd  || (SVC_RELOAD == cmd && svc->pid == 0))
-			svc_start(svc);
-		else if (SVC_RELOAD == cmd)
-			svc_reload(svc);
-	}
-
-	_d("Running svc up hooks ...");
-	plugin_run_hooks(HOOK_SVC_UP);
-}
-
-
 /**
 * Local Variables:
 *  compile-command: "gcc -g -DUNITTEST -o unittest svc.c"
@@ -1,4 +1,4 @@
-/* Finit service monitor and heneric API for managing svc_t structures
+/* Finit service monitor and generic API for managing svc_t structures
 *
 * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
 * Copyright (c) 2008-2012  Joachim Nilsson <troglobit@gmail.com>
@@ -36,6 +36,12 @@ typedef enum {
 	SVC_RELOAD		/* Enabled, needs restart */
 } svc_cmd_t;

+typedef enum {
+	SVC_CMD_SERVICE = 0,	/* Monitored, will be respawned */
+	SVC_CMD_TASK,		/* One-shot, runs in parallell */
+	SVC_CMD_RUN		/* Like task, but wait for completion */
+} svc_type_t;
+
 #define FINIT_SHM_ID     0x494E4954  /* "INIT", see ascii(7) */
 #define MAX_ARG_LEN      64
 #define MAX_STR_LEN      64
@@ -49,7 +55,10 @@ typedef enum {
 *   initctl <stop|start|restart> service */
 typedef struct svc {
 	pid_t	       pid;
+	svc_type_t     type;
 	int	       reload;
+	int            runlevels;
+	unsigned int   restart_counter; /* Incremented for each restart by service monitor. */
 	char	       cmd[MAX_ARG_LEN];
 	char	       args[MAX_NUM_SVC_ARGS][MAX_ARG_LEN];
 	char	       desc[MAX_STR_LEN];
@@ -86,8 +95,9 @@ static inline svc_t *finit_svc_connect(void)
 svc_t    *svc_new           (void);
 svc_t    *svc_find          (char *name);
 svc_t    *svc_iterator      (int restart);
+void      svc_runlevel      (int newlevel);

-int       svc_register      (char *line, char *username);
+int       svc_register      (int type, char *line, char *username);
 int       svc_id_by_name    (char *name);
 svc_cmd_t svc_enabled	    (svc_t *svc, int event, void *arg);
 int       svc_start         (svc_t *svc);
@@ -0,0 +1,211 @@
+/* Finit TTY handling
+ *
+ * Copyright (c) 2013  Mattias Walström <lazzer@gmail.com>
+ * Copyright (c) 2013  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <signal.h>
+#include <sys/wait.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "lite.h"
+#include "tty.h"
+
+LIST_HEAD(, tty_node) tty_list = LIST_HEAD_INITIALIZER();
+
+
+/* tty [!1-9,S] <DEV> [BAUD[,BAUD,...]] [TERM] */
+int tty_register(char *line)
+{
+	tty_node_t *entry;
+	int         insert = 0, baud = 0;
+	char       *cmd, *dev;
+	char       *runlevels = NULL, *term = NULL;
+
+	if (!line) {
+		_e("Invalid input argument.");
+		return errno = EINVAL;
+	}
+
+	cmd = strtok(line, " ");
+	if (!cmd) {
+	incomplete:
+		_e("Incomplete tty, cannot register.");
+		return errno = EINVAL;
+	}
+
+	if (cmd[0] == '[') {	/* [runlevels] */
+		runlevels = &cmd[0];
+		dev = strtok(NULL, " ");
+		if (!dev)
+			goto incomplete;
+	} else {
+		dev = cmd;
+	}
+
+	cmd = strtok(NULL, " ");
+	if (cmd) {
+		baud = strtonum(cmd, 50, 4000000, NULL);
+		term = strtok(NULL, " ");
+	}
+
+	entry = tty_find(dev);
+	if (!entry) {
+		insert = 1;
+		entry = calloc(1, sizeof(*entry));
+		if (!entry)
+			return errno = ENOMEM;
+	}
+
+	entry->data.name = strdup(dev);
+	if (!baud)
+		baud = BAUDRATE;
+	entry->data.baud = baud;
+	entry->data.term = term ? strdup(term) : NULL;
+	entry->data.runlevels = parse_runlevels(runlevels);
+	_d("Registering tty %s at %d baud with term=%s on runlevels %s", dev, baud, term ?: "N/A", runlevels);
+
+	if (insert)
+		LIST_INSERT_HEAD(&tty_list, entry, link);
+
+	return 0;
+}
+
+tty_node_t *tty_find(char *dev)
+{
+	tty_node_t *entry;
+
+	LIST_FOREACH(entry, &tty_list, link) {
+		if (!strcmp(dev, entry->data.name))
+			return entry;
+	}
+
+	return NULL;
+}
+
+tty_node_t *tty_find_by_pid(pid_t pid)
+{
+	tty_node_t *entry;
+
+	LIST_FOREACH(entry, &tty_list, link) {
+		if (entry->data.pid == pid)
+			return entry;
+	}
+
+	return NULL;
+}
+
+void tty_start(finit_tty_t *tty)
+{
+	int i = 0, is_console = 0;
+	char *cmd, *arg;
+	char  line[FILENAME_MAX];
+	char *args[42];
+
+	if (tty->pid)
+		return;
+
+	if (console && !strcmp(tty->name, console))
+		is_console = 1;
+
+#if   defined(GETTY_AGETTY)
+	snprintf(line, sizeof(line), "%s %s %d %s", GETTY, tty->name, tty->baud, tty->term ?: "");
+#elif defined(GETTY_BUSYBOX)
+	snprintf(line, sizeof(line), "%s %d %s %s", GETTY, tty->baud, tty->name, tty->term ?: "");
+#else
+#error No GETTY defined!
+#endif
+	cmd = strtok(line, " ");
+	args[i++] = basename(cmd);
+	while ((arg = strtok(NULL, " ")))
+		args[i++] = arg;
+	args[i] = NULL;
+
+	_d("Starting %s: %s on %s", is_console ? "console" : "TTY", cmd, tty->name);
+	tty->pid = run_getty(cmd, args, is_console);
+}
+
+void tty_stop(finit_tty_t *tty)
+{
+	if (!tty->pid)
+		return;
+
+	_d("Stopping TTY %s", tty->name);
+	kill(tty->pid, SIGTERM);
+	do_sleep(2);
+	kill(tty->pid, SIGKILL);
+	waitpid(tty->pid, NULL, 0);
+	tty->pid = 0;
+}
+
+int tty_enabled(finit_tty_t *tty, int runlevel)
+{
+	if (!tty)
+		return 0;
+
+	if (!ISSET(tty->runlevels, runlevel))
+		return 0;
+	else if (fexist(tty->name))
+		return 1;
+
+	return 0;
+}
+
+/* TTY monitor, called by svc_monitor() */
+int tty_respawn(pid_t pid)
+{
+	tty_node_t *entry = tty_find_by_pid(pid);
+
+	if (!entry)
+		return 0;
+
+	/* Clear PID to be able to respawn it. */
+	entry->data.pid = 0;
+
+	if (!tty_enabled(&entry->data, runlevel))
+		tty_stop(&entry->data);
+	else
+		tty_start(&entry->data);
+
+	return 1;
+}
+
+/* Start all TTYs that exist in the system and are allowed at this runlevel */
+void tty_runlevel(int runlevel)
+{
+	tty_node_t *entry;
+
+	LIST_FOREACH(entry, &tty_list, link) {
+		if (!tty_enabled(&entry->data, runlevel))
+			tty_stop(&entry->data);
+		else
+			tty_start(&entry->data);
+	}
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
@@ -0,0 +1,65 @@
+/* Finit TTY handling
+ *
+ * Copyright (c) 2013  Mattias Walström <lazzer@gmail.com>
+ * Copyright (c) 2013  Joachim Nilsson <troglobit@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef FINIT_TTY_H_
+#define FINIT_TTY_H_
+
+#include "queue.h"		/* BSD sys/queue.h API */
+
+#define EVENT_SIZE ((sizeof(struct inotify_event) + 20))
+
+typedef struct {
+	char  *name;
+	int    baud;
+        char  *term;
+	int    runlevels;
+
+	int    pid;
+} finit_tty_t;
+
+typedef struct tty_node {
+	LIST_ENTRY(tty_node) link;
+	finit_tty_t data;
+} tty_node_t;
+
+//extern LIST_HEAD(, tty_node) tty_list;
+
+int         tty_register    (char *line);
+tty_node_t *tty_find        (char *dev);
+tty_node_t *tty_find_by_pid (pid_t pid);
+void        tty_start       (finit_tty_t *tty);
+void        tty_stop        (finit_tty_t *tty);
+int         tty_enabled     (finit_tty_t *tty, int runlevel);
+int         tty_respawn     (pid_t pid);
+void        tty_runlevel    (int runlevel);
+
+#endif /* FINIT_TTY_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */
Author	SHA1	Message	Date
Joachim Nilsson	849f3fbb28	Explain finit.conf commands more in README, update example .conf Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-07 14:09:46 +02:00
Joachim Nilsson	329acf24bb	Bump version and start preparing docs for release of 1.8 Renamed ChangeLog to NEWS and fixed doc style to use ReST, like the README and TODO files. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-07 09:16:00 +02:00
Joachim Nilsson	bf40278131	Delay start of TTYs to let system stabilize at boot. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:27 +02:00
Joachim Nilsson	4f2cf52eff	Minor cleanup.	2013-06-06 18:19:27 +02:00
Joachim Nilsson	f96fb855ce	tty: Clear PID to be able to respawn it. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:27 +02:00
Joachim Nilsson	65f0be8a55	Simplify banner further, let distributions patch us instead. Revert crazy BANNER macro idea from `5ba7bc1`. It is simply too difficult to set -DBANNER='"Some distributions specific text"' in a parent Makefile without entering Shell/Make escape hell ... instead, downstream will have to patch the banner() function. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:26 +02:00
Joachim Nilsson	bcfcafdb7c	tty: Use calloc() instead of malloc() to prevent uninitialized errors. On some platforms GCC does not zero the heap. This can lead to serious problems, e.g., tty->pid may be non-zero while never having been started. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:26 +02:00
Joachim Nilsson	c57bd066d1	Build fix, if ROOTDIR was set linking failed. Use TOPDIR internally. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:26 +02:00
Joachim Nilsson	4171fbdfd3	Store RUN_LVL in UTMP and change RUNLEVEL_BOOT from 10 to 0 Standard init implementations save current and previous runlevels in utmp, now finit does too. Also, the initial runlevel at boot has changed from 10 to the more obvious 0. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:26 +02:00
Joachim Nilsson	0f60aa2289	Refactor TTY code to honor runlevels and use I/O plugin to watch /dev Add support for runlevels to tty command and support for reading baud rate and TERM variable from finit.conf. The tty-watcher thread has been converted to a standard I/O plugin. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:26 +02:00
Joachim Nilsson	f97aab4699	Rename stat_restart_counter --> restart_counter Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-06 18:19:18 +02:00
Joachim Nilsson	740d447442	Update Debian 6.0 example /etc/finit.conf and /etc/finit.d Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-04 13:12:53 +02:00
Joachim Nilsson	6448d6ccfa	Coding style and whitespace fixes Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-04 09:25:11 +02:00
Joachim Nilsson	25cc9f3b9b	Improve runlevel support by adding a bootstrap phase, also adds task/run cmd Most systems need an early bootstrap phase for one-shot tasks and necessary one-time probing. This phase usually runs well before any networking is setup. This commit adds support for that 'S' runlevel, and also extends the number of possible total runlevels to nine. For the one-shot tasks that run in bootstrap two new finit.conf cmds have been added: - task: For one-shot tasks that can be started in parallell - run: For one-shot tasks that must run in sequence Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-04 09:25:05 +02:00
Joachim Nilsson	e776838de9	Rename USE_UDEV & MDEV to SETUP_DEVFS and USE_MESSAGE_BUS to HAVE_DBUS USE_UDEV,MDEV => Unique SETUP_DEVFS for embedded or distro usage. USE_MESSAGE_BUS => HAVE_DBUS Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-04 07:21:08 +02:00
Joachim Nilsson	bf0cfe0693	Update and clarify TODO items, e.g., add info on new "task" and "run" stanzas Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-06-04 07:21:00 +02:00
Joachim Nilsson	f690767507	Refactor .conf file parser and add support for runlevel N This commit is a refactor of how arguments to finit.conf file settings are parsed. Not all settings are run directly, but only need the arg for future use. The code should be a lot easier to understand now. Also, added support for specifying the desired runlevel in finit.conf Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-22 12:42:56 +02:00
Joachim Nilsson	4d57b14b5b	Bugfix chomp() and set_hostname() chomp(): Removed first \n instead of last \n set_hostname(): If /etc/hostname exists we need to realloc the size of the current hostname variable. Also, only try to set the hostname if !NULL Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-22 12:41:59 +02:00
Joachim Nilsson	263036045a	tty: Check input arguments for invalid tty before adding. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-22 12:36:19 +02:00
Joachim Nilsson	56ef3f75d3	Build: Make subdir build prettier. The ROOTDIR variable was only set in the top-level Makefile, so when building from a subdirectory the output was slightly garbled. Moved ROOTDIR declaration to common.mk. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-22 06:18:52 +02:00
Joachim Nilsson	d0c902ab78	libite: Add strtonum() from OpenBSD Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-21 19:55:41 +02:00
Joachim Nilsson	5ba7bc1fdf	Cleanup and simplify boot process messages - Remove indentation of module loading and device node creation - Clarify that we load kernel modules - Clarify that we load Finit plugins - Remove cls() - Remove verbose condition for echo() - Make banner a separate function with optional distribution banner - Add a few neat ANSI escape sequences for cls(), clreol(), delline(), etc. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-21 12:52:06 +02:00
Joachim Nilsson	7e9ac7ba67	Fix indentation and ReST syntax. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-20 15:32:04 +02:00
Joachim Nilsson	e2eaee9620	TODO: Add entry on mimicing Debian SysV init rcS.d, runs once at boot. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-20 15:25:14 +02:00
Joachim Nilsson	b23ce7ab8e	Update TODO More inspiration and courage from the launchd Google Talk video! Fascinating stuff about replacing init/inetd/cron/watchdogd that I've been thinking about for ages! Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 23:39:23 +02:00
Joachim Nilsson	53127a7ce6	Update TODO Move to use ReST syntax, like README, and update to reflect current status of project. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:45 +02:00
Joachim Nilsson	011b73ba39	Fix issue with "Formatting of boot text changes in the middle of the boot." This commit adds a line: "Loading kernel modules ..." before increasing indentation level of module loading messages. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:45 +02:00
Mattias Walström	5d04a72a61	Add support for toggling the debug mode at runtime This commit adds support for -d, --debug option to init, which can be used to toggle the finit debug mode at runtime. Signed-off-by: Mattias Walström <lazzer@gmail.com> Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Joachim Nilsson	c3b76fdccf	Add basic support for runlevels and bugfix FIFO I/O plugins Like most other init implementations do, when entering runlevel 1, finit creates the file /etc/nologin to prevent users from logging in during single-user mode, this file is then removed upon leaving runlevel 1. Also, bugfix how FIFO I/O plugins are handled in finit. A FIFO will need to be reopened by the server side when the client closes the pipe. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Mattias Walström	ec95243dad	libite: Fix memory leak in dir() Signed-off-by: Mattias Walström <lazzer@gmail.com> Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Joachim Nilsson	ae5d4a0bb2	Add support for user/distribution specific banner at startup. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Joachim Nilsson	0231f858e9	helpers.c: Make system message optional top run_interactive() Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Joachim Nilsson	5d6db9f76f	tty.c: Minor cleanup and check global variable before dereferencing. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 19:01:44 +02:00
Mattias Walström	3bcefd2160	Add support for specifying TTYs and console TTY in finit.conf This commit adds support for specifying TTY and console to be used for starting a getty to login to the system Add the following to your finit.conf to use this feature: tty ttyS0 tty ttyUSB0 console ttyS0 Signed-off-by: Mattias Walström <lazzer@gmail.com> Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 18:45:27 +02:00
Joachim Nilsson	89675403d8	Add support for service restart counter. This commit adds a statistics counter to the finit svc_t process struct which is incremented every time a process is restarted by the service monitor. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 18:00:31 +02:00
Joachim Nilsson	f277166354	sig.c: Use watchdogd to reboot system This patch reorders the shutdown/reboot handler slightly and fixes a bug in sleep(). It seems the sleep() syscall was interrupted by receiving lots of SIGCHLD. Unsurprisingly since we just sent all processes SIGTERM, but unfortunate since that was too short time to deliver SIGTERM to watchdogd. We now call sleep() again, as long as it returns a non-zero value, until at most two (2) seconds have passed. During this time we basically pend for watchdogd to do its job and let the WDT reboot the system. If the two second timeout passes we send SIGKILL and forcibly reboot(RB_AUTOBOOT) the system. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 18:00:31 +02:00
Joachim Nilsson	b212babc87	helpers.c: Fix run() argparser, assumed all commands have args.	2013-05-19 18:00:31 +02:00
Joachim Nilsson	6518c2d246	libite: Improve error handling for copyfile() and rsync() When using the simple rsync() or copyfile() functions of libite some error codes should not be interpreted as error. I.e., if a file or directory already exists when attempting to create it. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 18:00:31 +02:00
Joachim Nilsson	c551228079	Makefile: Minor cleanup and only set ROOTDIR if unset already. The ROOTDIR variable is used for pretty formatting during compilation. Some users might want to have this display the build from the top of their tree instead of the finit build tree. Signed-off-by: Joachim Nilsson <troglobit@gmail.com>	2013-05-19 18:00:31 +02:00
Joachim Nilsson	c1198087af	TODO: Update with requests for more consoles and runlevel support	2013-05-19 18:00:31 +02:00
Joachim Nilsson	990ccc6d8b	Merge pull request #2 from mattiaswal/eglibc Add support for strlcpy and strlcat	2013-02-19 09:30:22 -08:00
Joachim Nilsson	56a16066b7	Merge pull request #1 from mattiaswal/tty Add basic support to specify TTYs in configuration	2013-02-19 09:30:06 -08:00
Mattias Walström	407a47dd12	libite: Add strlcat and strlcpy. These function only exist on uClibc and BSD, so if they not already defined in string.h, define them here.	2013-01-29 13:29:45 +01:00
Mattias Walström	73b43b4f2b	Add missing include <sys/stat.h>	2013-01-29 13:16:21 +01:00
Mattias Walström	5961748b2a	Add basic support to specify login TTYs in configuration This also adds support for monitor /dev for TTYs appering after boot, USB-to-serial converters for example. Some limitations: Baudrate (and other settings) is hardcoded for now, should be read from config file.	2013-01-22 21:17:20 +01:00