README: Redo feature table into a definition list.

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

.gitignore

@@ -1,2 +1,6 @@
 *.o
+.*.d
+*.so
 *.gz
+*.map
+finit

AUTHORS

@@ -0,0 +1,6 @@
+Current Maintainer(s):
+ * Joachim Nilsson <troglobit@gmail.com>
+
+Original Author(s):
+ * Claudio Matsuoka <cmatsuoka@gmail.com>
+

Changelog

@@ -1,4 +1,11 @@
-0.6 ()
+1.0 (UNRELEASED)
+	- New maintainer at GitHub http://github.com/troglobit/finit
+	- Make the unused finit.c finit-org.c for archival purposes
+	- Make finit-alt.c the new default finit.c
+	- 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
@@ -43,5 +50,5 @@ O.4 (20080516)
 	- moved finit-mod and finit-alt helpers to helpers.c
 	- replace system("echo;cat") to draw shutdown splash with C calls
 
-0.1 (20081214)
+0.1 (20080214)
 	- initial release

LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+Copyright (c) 2008-2012  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.

Makefile

@@ -1,91 +1,103 @@
-CC	= gcc
+# finit - The Improved fast init
-CFLAGS	= -Os -Wall -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\"
+#
-LD	= gcc
+# Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
-LDFLAGS	=
+# Copyright (c) 2008-2012  Joachim Nilsson <troglobit@gmail.com>
-LIBS	=
+#
-VERSION	= 0.6-pre
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-PKG	= finit-$(VERSION)
+# of this software and associated documentation files (the "Software"), to deal
-DFILES	= Makefile README finit.c finit-mod.c finit-alt.c helpers.c helpers.h \
+# in the Software without restriction, including without limitation the rights
-	  patches/*patch contrib/services.sh* contrib/Makefile.*
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-BINS	= finit-mod finit-alt finit-mdv #finit-exb
+# 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.
 
+.PHONY: all romfs clean
 
+# Top directory for building complete system, fall back to this directory
+ROOTDIR    ?= $(shell pwd)
+# Plugin directory, fall back to this directory if unset in environment
+PLUGIN_DIR ?= /lib/finit/plugins
 
-#### Configurable parameters
+#VERSION    ?= $(shell git tag -l | tail -1)
+VERSION    ?= 1.0
+EXEC        = finit
+PKG         = $(EXEC)-$(VERSION)
+ARCHIVE     = $(PKG).tar.xz
+OBJS        = finit.o conf.o helpers.o signal.o svc.o plugin.o
+OBJS       += strlcpy.o
+SRCS        = $(OBJS:.o=.c)
+DEPS        = $(addprefix .,$(SRCS:.c=.d))
+CFLAGS     += -W -Wall -Werror -Os
+# Disable annoying gcc warning for "warn_unused_result", see GIT 37af997
+CPPFLAGS   += -U_FORTIFY_SOURCE
+CPPFLAGS   += -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_GNU_SOURCE
+CPPFLAGS   += -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\"
+CPPFLAGS   += -DPLUGIN_PATH=\"$(PLUGIN_DIR)\"
+LDFLAGS    += -rdynamic
+LDLIBS     += -ldl
 
-# Default user for finit-alt if not "user"
+prefix     ?= /usr/local
-#DEFUSER = fred
+sysconfdir ?= /etc
+datadir     = $(prefix)/share/doc/finit
+mandir      = $(prefix)/share/man/man8
 
-# Disable annoying gcc warning
+include common.mk
-CFLAGS += -U_FORTIFY_SOURCE
+export PLUGIN_DIR ROOTDIR CPPFLAGS
 
-# Use -march=pentium-m to build for Eeepc
+all: Makefile $(EXEC)
-#CFLAGS += -march=pentium-m
+	$(MAKE) -C plugins $@
 
-# Omit the first /sbin/hwclock if CONFIG_RTC_HCTOSYS is enabled in the kernel 
+$(OBJS): Makefile
-#CFLAGS += -DNO_HCTOSYS
 
-# Append -directisa to /sbin/hwclock lines if the user has disabled
+$(EXEC): $(OBJS)
-# CONFIG_GENRTC and enabled CONFIG_RTC but not enabled CONFIG_HPET_TIMER
-# and CONFIG_HPET_RTC_IRQ.
-#CFLAGS += -DDIRECTISA
 
-# Use built-in run-parts instead of /bin/run-parts
+#	@ln -sf /sbin/finit /sbin/init
-CFLAGS += -DBUILTIN_RUNPARTS
+install: all
+	@install -d $(DESTDIR)$(prefix)/sbin
+	@install -d $(DESTDIR)$(sysconfdir)
+	@install -d $(DESTDIR)$(datadir)
+	@install -d $(DESTDIR)$(mandir)
+	@for file in $(EXEC); do                                        \
+		printf "  INSTALL $(DESTDIR)$(prefix)/sbin/$$file\n";   \
+		install -m 0755 $$file $(DESTDIR)$(prefix)/sbin/$$file; \
+	done
+	$(MAKE) -C plugins $@
 
-#### End of configurable parameters
+uninstall:
-
+	-@for file in $(EXEC); do \
-
+		printf "  REMOVE  $(DESTDIR)$(prefix)/sbin/$$file\n";   \
-
+		rm $(DESTDIR)$(prefix)/sbin/$$file 2>/dev/null; \
-ifneq ($(DEFUSER),)
+	done
-CFLAGS += -DDEFUSER=\"$(DEFUSER)\"
+	$(MAKE) -C plugins $@
-endif
-
-.c.o:
-	$(CC) -c $(CFLAGS) -o $*.o $<
-
-all: $(BINS)
-
-finit: finit.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mod: finit-mod.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-alt: finit-alt.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mdv: finit-mdv.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mdv.o: finit-alt.c Makefile
-	$(CC) -c $(CFLAGS) -DDIST_MDV -o $@ finit-alt.c
-
-finit-exb: finit-exb.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-exb.o: finit-alt.c Makefile
-	$(CC) -c $(CFLAGS) -DDIST_EEEXUBUNTU -o $@ finit-alt.c
 
 clean:
-	rm -f *.o core *~ $(BINS)
+	-@$(RM) $(OBJS) $(DEPS) $(EXEC)
+	$(MAKE) -C plugins $@
 
-finit.o: finit.c Makefile
+distclean: clean
-
+	-@$(RM) $(JUNK)  unittest *.o
-finit-mod.o: finit-mod.c Makefile
+	$(MAKE) -C plugins $@
-
-helpers.o: helpers.c  Makefile
 
 dist:
-	rm -Rf $(PKG)
+	@echo "Building xz tarball of $(PKG) in parent dir..."
-	mkdir -p $(PKG)/contrib $(PKG)/patches
+	git archive --format=tar --prefix=$(PKG)/ $(VERSION) | xz >../$(ARCHIVE)
-	for i in $(DFILES); do cp $$i $(PKG)/`dirname $$i`; done
+	@(cd ..; md5sum $(ARCHIVE) | tee $(ARCHIVE).md5)
-	tar cf - $(PKG) | gzip -c > $(PKG).tar.gz
-	rm -Rf $(PKG)
-	ls -l $(PKG).tar.gz
 
+# 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)
+endif
+endif

README

@@ -1,48 +0,0 @@
-
-Finit is a reimplementation of the Eeepc "fastinit" program based on its
-system calls with gaps filled with frog DNA.
-
-Finit's purpose is to build upon the general workings of fastinit and
-improve/optimize it for Xandros or alternative distributions running on
-the Eeepc. Finit comes in three flavors: finit is a replica of the Asus
-fastinit, finit-mod is an improved drop-in replacement for fastinit,
-and finit-alt is a generic replacement for other systems. Finit-mod
-and finit-alt were much improved with patches from Metalshark. 
-
-See more information at http://helllabs.org/finit/
-
-
-Usage scenarios
----------------
-
-1. Replace the original Eeepc 702 fastinit (finit-mod)
-
-2. Allow fast booting in alternative Linux distributions running on the
-   Eeepc and other netbooks (finit-alt)
-
-
-Finit-alt is distribution-specific. Currently it generates a finit-mdv
-executable for Mandriva 2008/2008.1 systems. Smurfy ported it to
-eeeXubuntu, and parts of his port have been merged to finit-alt.
-
-
-Finit-alt features
-------------------
-
-Finit-alt reads configuration information from /etc/finit.conf. See
-the source code for available options.
-
-
-Rebooting and halting
----------------------
-
-Finit handles SIGUSR1 and SIGUSR2 for reboot and halt, and listens to
-/dev/initctl so standard Linux reboot and halt commands should also
-work.
-
-
-Debugging
----------
-
-Add finit_debug to the kernel parameter line to enable trace messages
-and to run a shell after the X server.

README

@@ -0,0 +1 @@
+README.rst

README.eeexubuntu

@@ -1,4 +0,0 @@
-
-Experimental eeeXubuntu support merged from smurfy's port, see
-http://forum.eeeuser.com/viewtopic.php?id=15685
-

README.mandriva

@@ -1,33 +0,0 @@
-
-Mandriva 2008
--------------
-
-1 - Add init=/sbin/finit-mdv to the kernel boot line
-
-2 - Provide a suitable /usr/sbin/services.sh, this is the one I use in my
-    test system running e17:
-
-    mkdir /var/lock/subsys
-    chmod 1777 /var/lock/subsys
-    /etc/init.d/network start
-    dhclient eth0
-    /sbin/start_udev&
-    /etc/init.d/portmap start
-    /etc/init.d/nfs-common start
-
-    If you use KDE or need more services, see examples in contrib/
-
-3 - Create /etc/finit.conf with user, module, filesystems to check and
-    hostname parameters. See the included finit.conf for more information.
-    If no user is specified, user "user" will be used as default.
-
-4 - Set the pointer device in the X server configuration to /dev/input/mice
-
-
-
-Mandriva 2008.1
----------------
-
-If you have a stuck nash-hotplug consuming 100% of CPU after the boot, you
-may want to patch mkinitrd using patches/mkinitrd-6.0.34-nash-hotplug.patch
-

README.rst

@@ -0,0 +1,91 @@
+==============================================================================
+        Finit — A fast plugin-based /sbin/init with service monitoring
+==============================================================================
+
+Welcome to finit!
+
+This is a heavily extended version of the original /sbin/init replacement
+finit_.  The original was a reimplementation of the EeePC "fastinit" daemon
+based on its system calls with gaps filled with frog DNA.
+
+Focus of this extended version is on small embedded GNU/Linux systems and
+headless miniature servers with a need for extremely fast boot.  In such
+environments configurations rarely change and setup is rather static and
+straight forward.
+
+In the world of finit we write C "scripts" to boot our system, this is what
+gives the system its raw performance and the user full control.
+
+If you chose finit you know what you want, a fast boot with no hassle.
+
+
+Features
+--------
+
+**Service monitoring**
+   Restarting a service when it exits
+
+**Plugins**
+   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
+
+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
+plugins with either hooks or I/O demands.
+
+
+/etc/finit.conf
+---------------
+
+Contrary to most script based init alternatives (SysV init_, upstart_, OpenRC_
+and the likes) finit reads its configuration from /etc/finit.conf, see the
+source code for available options.
+
+Try out the examples/finit.conf for a Debian 6.0 example configuration
+capable of service monitoring SSH, sysklogd, gdm and a console getty!
+
+
+/etc/finit.d
+------------
+
+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_.
+
+
+Rebooting and Halting
+---------------------
+
+Finit handles SIGUSR1 and SIGUSR2 for reboot and halt, and listens to
+/dev/initctl so standard Linux reboot and halt commands should also
+work.
+
+
+Debugging
+---------
+
+Add finit_debug, or --debug, to the kernel command line to enable trace
+messages.  A console getty is always started, see the file finit.h for
+more useful comile-time tweaks.
+
+Contact
+-------
+
+Finit is maintained collaborativly at https://github.com/troglobit/finit —
+please file a bug report, clone it, or send pull requests for bug fixes and
+proposed extensions, or become a co-maintainer by contacting the main author.
+
+Regards
+ /Joachim Nilsson <troglobit@gmail.com>
+
+.. _finit: http://helllabs.org/finit/
+.. _init: http://savannah.nongnu.org/projects/sysvinit
+.. _upstart: http://upstart.ubuntu.com/
+.. _openrc: http://www.gentoo.org/proj/en/base/openrc/
+

TODO

@@ -0,0 +1,5 @@
+* 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

common.mk

@@ -0,0 +1,23 @@
+# 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
+
+# Smart autodependecy generation via GCC -M.
+.%.d: %.c
+	@$(SHELL) -ec "$(CC) -MM $(CFLAGS) $(CPPFLAGS) $< \
+		| sed 's,.*: ,$*.o $@ : ,g' > $@; \
+                [ -s $@ ] || rm -f $@"
+
+# Override default implicit rules
+%.o: %.c
+	@printf "  CC      $(subst $(ROOTDIR)/,,$(shell pwd)/$@)\n"
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+
+%: %.o
+	@printf "  LINK    $(subst $(ROOTDIR)/,,$(shell pwd)/$@)\n"
+	@$(CC) $(CFLAGS) $(LDFLAGS) -Wl,-Map,$@.map -o $@ $^ $(LDLIBS$(LDLIBS-$(@)))
+
+%.so: %.o
+	@printf "  PLUGIN  $(subst $(ROOTDIR)/,,$(shell pwd)/$@)\n"
+	@$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)

conf.c

@@ -0,0 +1,145 @@
+/* Parser for finit.conf
+ *
+ * Copyright (c) 2012  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 <string.h>
+
+#include "finit.h"
+#include "svc.h"
+#include "helpers.h"
+
+/* Match one command. */
+#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)
+{
+	int l;
+	char *c;
+
+	/* Trim leading whitespace */
+	while (*line && (*line == ' ' || *line == '\t'))
+		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;
+
+	_d("cmd = %s", cmd);
+	return cmd;
+}
+
+void parse_finit_conf(char *file)
+{
+	FILE *fp;
+	char line[LINE_SIZE];
+	char cmd[CMD_SIZE];
+
+	/* Default username and hostname */
+	username = strdup(DEFUSER);
+	hostname = strdup(DEFHOST);
+
+	if ((fp = fopen(file, "r")) != NULL) {
+		char *x;
+
+		_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)) {
+				continue;
+			}
+			/* Do this before mounting / read-write */
+			if (MATCH_CMD(line, "check ", x)) {
+				strcpy(cmd, "/sbin/fsck -C -a ");
+				build_cmd(cmd, x, CMD_SIZE);
+				run_interactive(cmd, "Checking file system integrity on %s", x);
+				continue;
+			}
+			if (MATCH_CMD(line, "user ", x)) {
+				if (username) free(username);
+				username = build_cmd(NULL, x, USERNAME_SIZE);
+				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);
+				continue;
+			}
+			if (MATCH_CMD(line, "module ", x)) {
+				strcpy(cmd, "/sbin/modprobe ");
+				build_cmd(cmd, x, CMD_SIZE);
+				run_interactive(cmd, "   Loading module %s", x);
+				continue;
+			}
+			if (MATCH_CMD(line, "mknod ", x)) {
+				strcpy(cmd, "/bin/mknod ");
+				build_cmd(cmd, x, CMD_SIZE);
+				run_interactive(cmd, "   Creating device node %s", x);
+				continue;
+			}
+			if (MATCH_CMD(line, "network ", x)) {
+				if (network) free(network);
+				network = build_cmd(NULL, x, CMD_SIZE);
+				continue;
+			}
+			if (MATCH_CMD(line, "startx ", x)) {
+				svc_register(x, username);
+				continue;
+			}
+			if (MATCH_CMD(line, "service ", x)) {
+				svc_register(x, NULL);
+				continue;
+			}
+		}
+		fclose(fp);
+	}
+}
+
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

contrib/Makefile.gdium

@@ -1,88 +0,0 @@
-CC	= gcc
-CFLAGS	= -Os -Wall -DVERSION=\"$(VERSION)\" -DWHOAMI=\"`whoami`@`hostname`\"
-LD	= gcc
-LDFLAGS	=
-LIBS	=
-VERSION	= 0.6-pre
-PKG	= finit-$(VERSION)
-DFILES	= Makefile README finit.c finit-mod.c finit-alt.c helpers.c helpers.h \
-	  patches/*patch contrib/services.sh*
-BINS	= finit-mod finit-alt finit-mdv #finit-exb
-
-
-
-#### Configurable parameters
-
-# Default user for finit-alt if not "user"
-#DEFUSER = fred
-
-# Use -march=pentium-m to build for Eeepc
-#CFLAGS += -march=pentium-m
-
-# Omit the first /sbin/hwclock if CONFIG_RTC_HCTOSYS is enabled in the kernel 
-CFLAGS += -DNO_HCTOSYS
-
-# Append -directisa to /sbin/hwclock lines if the user has disabled
-# CONFIG_GENRTC and enabled CONFIG_RTC but not enabled CONFIG_HPET_TIMER
-# and CONFIG_HPET_RTC_IRQ.
-#CFLAGS += -DDIRECTISA
-
-# Use built-in run-parts instead of /bin/run-parts
-CFLAGS += -DBUILTIN_RUNPARTS
-
-#### End of configurable parameters
-
-
-
-ifneq ($(DEFUSER),)
-CFLAGS += -DDEFUSER=\"$(DEFUSER)\"
-endif
-
-.c.o:
-	$(CC) -c $(CFLAGS) -o $*.o $<
-
-all: $(BINS)
-
-finit: finit.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mod: finit-mod.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-alt: finit-alt.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mdv: finit-mdv.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-mdv.o: finit-alt.c Makefile
-	$(CC) -c $(CFLAGS) -DDIST_MDV -o $@ finit-alt.c
-
-finit-exb: finit-exb.o helpers.o
-	$(LD) $(LDFLAGS) -o $@ $+ $(LIBS)
-	strip $@
-
-finit-exb.o: finit-alt.c Makefile
-	$(CC) -c $(CFLAGS) -DDIST_EEEXUBUNTU -o $@ finit-alt.c
-
-clean:
-	rm -f *.o core *~ $(BINS)
-
-finit.o: finit.c Makefile
-
-finit-mod.o: finit-mod.c Makefile
-
-helpers.o: helpers.c  Makefile
-
-dist:
-	rm -Rf $(PKG)
-	mkdir -p $(PKG)/contrib $(PKG)/patches
-	for i in $(DFILES); do cp $$i $(PKG)/`dirname $$i`; done
-	tar cf - $(PKG) | gzip -c > $(PKG).tar.gz
-	rm -Rf $(PKG)
-	ls -l $(PKG).tar.gz
-

contrib/services.sh-mdv2008

@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# Example /usr/sbin/services.sh that can be used in a Mandriva 2008 system
-# running KDE
-
-mkdir /var/lock/subsys
-chmod 1777  /var/lock/subsys
-/sbin/start_udev
-mkdir /var/run/dbus
-/etc/init.d/messagebus start
-/etc/init.d/haldaemon start
-/etc/init.d/alsa start
-/etc/init.d/sound start
-/etc/init.d/crond start
-/etc/init.d/network-up start
-/etc/init.d/network start
-#/etc/init.d/sshd start
-/etc/init.d/syslog start
-/sbin/pam_console_apply
-#kbuildsycoca --noincremental

contrib/services.sh-mdv2008.1-pterjan

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Else oocalc will crash
-mknod /dev/random c 1 8
-
-mkdir /var/lock/subsys
-chmod 1777  /var/lock/subsys
-mkdir /var/run/dbus
-mkdir /var/run/netreport
-
-/etc/init.d/messagebus start
-
-/sbin/start_udev.simple
-for module in `/bin/grep -hv '#' /etc/modprobe.preload /etc/modprobe.preload.d/*`; do
-  /sbin/modprobe $module
-done
- 
-# Need to find a way to apply udev config
-chmod 0666 /dev/ptmx
-
-/etc/init.d/network-up start
-/etc/init.d/network start
-/etc/init.d/acpid start
-/etc/init.d/haldaemon start
-sleep 10
-for i in /etc/rc5.d/S*; do
-	$i status > /dev/null 2>&1 || $i start
-done

contrib/services.sh-miura

@@ -1,44 +0,0 @@
-#!/bin/sh
-# precaution, if the hotplug tag exists in mkinitrd
-killall nash-hotplug &
-
-#give some priority to the user processes
-renice -5 -u gdium
-
-# Else oocalc will crash
-mknod /dev/random c 1 8 &
-mkdir /var/lock/subsys &
-chmod 1777  /var/lock/subsys
-mkdir /var/run/dbus &
-mkdir /var/run/netreport &
-mkdir /var/run/ConsoleKit &
-mkdir /var/log &
-/etc/init.d/haldaemon start &
-
-sleep 25
-# postpone udev and others startup, they are too slow
-# limit the amount of udev childs, should speed up a little
-export UDEV_MAX_CHILDS=2
-export UDEV_MAX_CHILDS_RUNNING=2
-/sbin/start_udev
-/sbin/swapon -a &
-
-chmod 0666 /dev/null
-chmod 0666 /dev/ptmx
-/etc/init.d/alsa start
-/etc/init.d/network start
-for module in `/bin/grep -hv '#' /etc/modprobe.preload /etc/modprobe.preload.d/*`; do
-	  /sbin/modprobe $module
-done
-
-# restore (hopefully) the priority to the user processes
-renice 0 -u gdium
-
-# fuse status always say 0
-/sbin/service fuse start
-for i in /etc/rc5.d/S*; do
-	$i status > /dev/null 2>&1 || $i start
-done
-
-# enable this to stop bootchart when testing
-(sleep 30; /sbin/bootchartd stop)&

examples/finit.conf

@@ -0,0 +1,12 @@
+# Simple Debian finit.conf
+check /dev/vda1
+module evdev
+module loop
+module psmouse
+user admin
+host testbed
+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

examples/services

@@ -0,0 +1,15 @@
+#!/bin/sh
+# Alternative boot method for other distributions than Debian 6.0
+# Place this file in a /etc/finit.d/ directory. At boot finit will
+# run all files, using its built-in run_parts(), in that directory.
+#
+# Here we chain load Debian /etc/rcS.d and /etc/rc2.d directories
+# in sequence using the standard run-parts tool.
+run-parts /etc/rcS.d --arg=start
+run-parts /etc/rc2.d --arg=start
+
+# You can also place other commands in this services file, akin to
+# the old finit /usr/sbin/services.sh (not supported anymore).
+#service acpid start
+#service networking start
+#service ssh start

finit-alt.c

@@ -1,621 +0,0 @@
-/*
-Improved fast init
-
-Copyright (c) 2008 Claudio Matsuoka
-
-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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/reboot.h>
-#include <sys/wait.h>
-#include <linux/fs.h>
-#include <utmp.h>
-
-#include "helpers.h"
-
-#ifndef DEFUSER
-#define DEFUSER "user"
-#endif
-
-/* Distribution configuration */
-
-#if defined DIST_MDV	/* Mandriva */
-#define RANDOMSEED	"/var/lib/random-seed"
-#define SYSROOT		"/sysroot"
-#define GETTY		"/usr/bin/openvt /sbin/mingetty tty2"
-#define RUNPARTS	"/usr/bin/run-parts"
-#define REMOUNT_ROOTFS_RW
-#define MAKE_DEVICES
-#define MAKE_DEV_VCS
-#define PAM_CONSOLE
-#define LISTEN_INITCTL
-#define RUNLEVEL	5
-#define USE_MESSAGE_BUS
-#elif defined DIST_EEEXUBUNTU	/* eeeXubuntu */
-#define RANDOMSEED	"/var/lib/urandom/random-seed"
-#define SYSROOT		"/sysroot"
-#define GETTY		"/usr/bin/openvt /sbin/getty 38400 tty2"
-#define RUNPARTS	"/bin/run-parts"
-#define REMOUNT_ROOTFS_RW
-#define MAKE_DEVICES
-#define TOUCH_ETC_NETWORK_RUN_IFSTATE
-#define LISTEN_INITCTL
-#else			/* original Eeepc distribution */
-#define RANDOMSEED	"/var/lib/urandom/random-seed"
-#define SYSROOT		"/mnt"
-#define GETTY		"/usr/bin/openvt /sbin/getty 38400 tty2"
-#define RUNPARTS	"/bin/run-parts"
-#define TOUCH_ETC_NETWORK_RUN_IFSTATE
-#define USE_ETC_RESOLVCONF_RUN
-#endif
-
-#ifdef DIRECTISA
-#define HWCLOCK_DIRECTISA " --directisa"
-#else
-#define HWCLOCK_DIRECTISA
-#endif
-
-
-/* From sysvinit */
-/* Set a signal handler. */
-#define SETSIG(sa, sig, fun, flags) \
-		do { \
-			sa.sa_handler = fun; \
-			sa.sa_flags = flags; \
-			sigemptyset(&sa.sa_mask); \
-			sigaction(sig, &sa, NULL); \
-		} while (0)
-
-#ifdef LISTEN_INITCTL
-
-#define INIT_MAGIC		0x03091969
-#define INIT_CMD_RUNLVL		1
-
-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];
-};
-#endif
-
-#define touch(x) mknod((x), S_IFREG|0644, 0)
-#define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))
-#define blkdev(x,m,maj,min) mknod((x), S_IFBLK|(m), makedev((maj),(min)))
-
-#define MATCH_CMD(l,c,x) \
-	((!strncmp((l), (c), strlen((c)))) && ((x) = (l) + strlen((c))))
-
-#define _d(x...) do { if (debug) { printf(x); printf("\n"); } } while (0)
-
-#define LINE_SIZE 1024
-#define CMD_SIZE 256
-#define USERNAME_SIZE 16
-#define HOSTNAME_SIZE 32
-
-void shutdown(int);
-void signal_handler(int);
-void chld_handler(int);
-
-static int debug = 0;
-static char sdown[CMD_SIZE];
-
-static void build_cmd(char *cmd, char *x, int len)
-{
-	int l;
-	char *c;
-
-	c = cmd + strlen(cmd);
-
-	/* skip spaces */
-	for (; *x && (*x == ' ' || *x == '\t'); x++); 
-
-	/* copy next arg */
-	for (l = 0; *x && *x != '#' && *x != '\t' && l < len; l++)
-		*c++ = *x++;
-	*c = 0;
-
-	_d("cmd = %s", cmd);
-}
-
-
-#ifdef LISTEN_INITCTL
-
-/* Standard reboot/shutdown utilities talk to init using /dev/initctl.
- * We should check if the fifo was recreated and reopen it.
- */
-static void listen_initctl()
-{
-	if (!fork()) {	
-		int ctl;	
-		fd_set fds;	
-		struct init_request request;
-
-		mkfifo("/dev/initctl", 0600);
-		ctl = open("/dev/initctl", O_RDONLY);
-
-		while (1) {
-			FD_ZERO(&fds);
-			FD_SET(ctl, &fds);
-			if (select(ctl + 1, &fds, NULL, NULL, NULL) <= 0)
-				continue;
-
-			read(ctl, &request, sizeof(request));
-
-			if (request.magic != INIT_MAGIC)
-				continue;
-
-			if (request.cmd == INIT_CMD_RUNLVL) {
-				switch (request.runlevel) {
-				case '0':
-					shutdown(SIGUSR2);
-					break;
-				case '6':
-					shutdown(SIGUSR1);
-				}
-			}
-		}
-	}
-}
-#endif
-
-
-int main()
-{
-	int i;
-	FILE *f;
-	char line[LINE_SIZE];
-	struct sigaction sa, act;
-	sigset_t nmask, nmask2;
-	char username[USERNAME_SIZE] = DEFUSER;
-	char hostname[HOSTNAME_SIZE] = "eviltwin";
-	char cmd[CMD_SIZE];
-	char startx[CMD_SIZE] = "xinit";
-#ifdef USE_ETC_RESOLVCONF_RUN
-	DIR *dir;
-	struct dirent *d;
-#endif
-#ifdef RUNLEVEL
-	struct utmp entry;
-#endif
-#ifdef PAM_CONSOLE
-	int fd;
-#endif
-
-	chdir("/");
-	umask(022);
-	
-	/*
-	 * Signal management
-	 */
-	for (i = 1; i < NSIG; i++)
-		SETSIG(sa, i, SIG_IGN, SA_RESTART);
-
-	SETSIG(sa, SIGINT,  shutdown, 0);
-	SETSIG(sa, SIGPWR,  SIG_IGN, 0);
-	SETSIG(sa, SIGUSR1, shutdown, 0);
-	SETSIG(sa, SIGUSR2, shutdown, 0);
-	SETSIG(sa, SIGTERM, SIG_IGN, 0);
-	SETSIG(sa, SIGALRM, SIG_IGN, 0);
-	SETSIG(sa, SIGHUP,  SIG_IGN, 0);
-	SETSIG(sa, SIGCONT, SIG_IGN, SA_RESTART);
-	SETSIG(sa, SIGCHLD, chld_handler, SA_RESTART);
-	
-	/* Block sigchild while forking */
-	sigemptyset(&nmask);
-	sigaddset(&nmask, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &nmask, NULL);
-
-	reboot(RB_DISABLE_CAD);
-
-	mount("none", "/proc", "proc", 0, NULL);
-	mount("none", "/sys", "sysfs", 0, NULL);
-
-	/*
-	 * Parse kernel parameters
-	 */
-	if ((f = fopen("/proc/cmdline", "r")) != NULL) {
-		fgets(line, LINE_SIZE, f);
-		if ((strstr(line, "finit_debug"))) {
-			debug = 1;
-		}
-		if (strstr(line, "quiet")) {
-			close(0);
-			close(1);
-			close(2);
-		}
-		fclose(f);
-	}
-
-	_d("finit-alt " VERSION " (built " __DATE__ " " __TIME__ " by " WHOAMI ")");
-
-	setsid();
-
-	/*
-	 * Parse configuration file
-	 */
-	if ((f = fopen("/etc/finit.conf", "r")) != NULL) {
-		char *x;
-		while (!feof(f)) {
-			fgets(line, LINE_SIZE, f);
-			chomp(line);
-
-			_d("conf: %s", line);
-
-			/* Do this before mounting / read-write */
-			if (MATCH_CMD(line, "check ", x)) {
-				strcpy(cmd, "/sbin/fsck -C -a ");
-				build_cmd(cmd, x, CMD_SIZE);
-				system(cmd);
-				continue;
-			}
-			if (MATCH_CMD(line, "user ", x)) {
-				*username = 0;
-				build_cmd(username, x, USERNAME_SIZE);
-				continue;
-			}
-			if (MATCH_CMD(line, "startx ", x)) {
-				*startx = 0;
-				build_cmd(startx, x, CMD_SIZE);
-				continue;
-			}
-			if (MATCH_CMD(line, "host ", x)) {
-				*hostname = 0;
-				build_cmd(hostname, x, HOSTNAME_SIZE);
-				continue;
-			}
-			if (MATCH_CMD(line, "shutdown ", x)) {
-				*sdown = 0;
-				build_cmd(sdown, x, CMD_SIZE);
-				continue;
-			}
-			if (MATCH_CMD(line, "module ", x)) {
-				strcpy(cmd, "/sbin/modprobe ");
-				build_cmd(cmd, x, CMD_SIZE);
-				system(cmd);
-				continue;
-			}
-#ifdef MAKE_DEVICES
-			/* This is used if the system uses udev and doesn't
-			 * mount /dev as tmpfs in the initrd, or if it doesn't
-			 * use an initrd. Mount /dev as tmpfs and create basic
-			 * device nodes.
-			 */
-			if (MATCH_CMD(line, "mountdev", x)) {
-				mount("none", "/dev", "tmpfs", 0, "mode=0755");
-				chardev("/dev/null", 0666, 1, 3);
-				blkdev("/dev/sda1", 0660, 8, 1);
-				blkdev("/dev/sda2", 0660, 8, 2);
-				blkdev("/dev/sda3", 0660, 8, 3);
-				blkdev("/dev/sda4", 0660, 8, 4);
-				blkdev("/dev/sda5", 0660, 8, 5);
-				blkdev("/dev/sda6", 0660, 8, 6);
-#ifdef MAKE_DEV_VCS
-			/* Caio reports that newer X.org needs these */
-				blkdev("/dev/vcs1", 0660, 7, 1);
-				blkdev("/dev/vcs2", 0660, 7, 2);
-				blkdev("/dev/vcs3", 0660, 7, 3);
-				blkdev("/dev/vcs4", 0660, 7, 4);
-				blkdev("/dev/vcsa1", 0660, 7, 129);
-				blkdev("/dev/vcsa2", 0660, 7, 130);
-				blkdev("/dev/vcsa3", 0660, 7, 131);
-				blkdev("/dev/vcsa4", 0660, 7, 132);
-#endif
-				continue;
-			}
-			/* This works only if /dev is tmpfs! If not, create
-			 * devices statically on the filesystem
-			 */
-			if (MATCH_CMD(line, "mknod ", x)) {
-				strcpy(cmd, "/bin/mknod ");
-				build_cmd(cmd, x, CMD_SIZE);
-				system(cmd);
-				continue;
-			}
-#endif
-		}
-		fclose(f);
-	}
-
-	/*
-	 * Mount filesystems
-	 */
-	_d("mount filesystems");
-
-#ifdef REMOUNT_ROOTFS_RW
-	system("/bin/mount -n -o remount,rw /");
-#endif
-	umask(0);
-
-#ifdef MAKE_DEVICES
-	mkdir("/dev/shm", 0755);
-	mkdir("/dev/pts", 0755);
-#endif
-
-	mount("none", "/dev/pts", "devpts", 0, "gid=5,mode=620");
-	mount("none", "/dev/shm", "tmpfs", 0, NULL);
-	mount("none", "/tmp", "tmpfs", 0, "mode=1777,size=128m");
-	mount("none", "/var/run", "tmpfs", 0, "mode=0755");
-	mount("none", "/var/lock", "tmpfs", 0, "mode=1777");
-	mount("none", "/proc/bus/usb", "usbfs", 0, NULL);
-	mount(SYSROOT, "/", NULL, MS_MOVE, NULL);
-
-	_d("make devices");
-#ifdef MAKE_DEVICES
-	mkdir("/dev/input", 0755);
-	chardev("/dev/urandom", 0666, 1, 9);
-	chardev("/dev/ptmx", 0666, 5, 2);
-	chardev("/dev/null", 0666, 1, 3);
-	chmod("/dev/null", 0666);
-	chardev("/dev/mem",  0640, 1, 1);
-	chardev("/dev/tty0",  0660, 4, 0);
-	chardev("/dev/tty1",  0660, 4, 1);
-	chardev("/dev/tty2",  0660, 4, 2);
-	chardev("/dev/tty3",  0660, 4, 3);
-	chardev("/dev/input/mice",  0660, 13, 63);
-	chardev("/dev/input/event0",  0660, 13, 64);
-	chardev("/dev/agpgart",  0660, 10, 175);
-	blkdev("/dev/loop0",  0600, 7, 0);
-#endif
-
-	unlink("/etc/mtab");
-	system("mount -a");
-
-	umask(0022);
-
-	/*
-	 * Time adjustments
-	 */
-	_d("adjust clock");
-#ifndef NO_HCTOSYS
-	system("/sbin/hwclock --hctosys" HWCLOCK_DIRECTISA);
-#endif
-
-	/*
-	 * Network stuff
-	 */
-
-#ifdef USE_ETC_RESOLVCONF_RUN
-	makepath("/dev/shm/network");
-	makepath("/dev/shm/resolvconf/interface");
-
-	if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) {
-		while ((d = readdir(dir)) != NULL) {
-			if (isalnum(d->d_name[0]))
-				continue;
-			snprintf(line, LINE_SIZE,
-				"/etc/resolvconf/run/interface/%s", d->d_name);
-			unlink(line);
-		}
-
-		closedir(dir);
-	}
-#endif
-
-#ifdef USE_VAR_RUN_RESOLVCONF
-	makepath("/var/run/resolvconf/interface");
-	symlink("../../../etc/resolv.conf", "/var/run/resolvconf/resolv.conf");
-#endif
-
-	touch("/var/run/utmp");
-	chown("/var/run/utmp", 0, getgroup("utmp"));
-	chmod("/var/run/utmp", 0664);
-
-#ifdef RUNLEVEL
-	memset(&entry, 0, sizeof(struct utmp));
-	entry.ut_type = RUN_LVL;
-	entry.ut_pid = '0' + RUNLEVEL;
-	setutent();
-	pututline(&entry);
-	endutent();
-#endif
-
-#ifdef USE_ETC_RESOLVCONF_RUN
-	touch("/etc/resolvconf/run/enable-updates");
-
-	chdir("/etc/resolvconf/run/interface");
-#ifdef BUILTIN_RUNPARTS
-	run_parts("/etc/resolvconf/update.d", "-i", NULL);
-#else
-	system(RUNPARTS " --arg=i /etc/resolvconf/update.d");
-#endif
-	chdir("/");
-#endif
-	
-#ifdef TOUCH_ETC_NETWORK_RUN_IFSTATE
-	touch("/etc/network/run/ifstate");
-#endif
-
-	if ((f = fopen("/etc/hostname", "r")) != NULL) {
-		fgets(hostname, HOSTNAME_SIZE, f);	
-		chomp(hostname);
-		fclose(f);
-	}
-
-	sethostname(hostname, strlen(hostname)); 
-
-	ifconfig("lo", "127.0.0.1", "255.0.0.0", 1);
-
-	/*
-	 * Set random seed
-	 */
-	copyfile(RANDOMSEED, "/dev/urandom", 0);
-	unlink(RANDOMSEED);
-	umask(077);
-	copyfile("/dev/urandom", RANDOMSEED, 4096);
-	umask(0);
-
-	/*
-	 * Console setup (for X)
-	 */
-	makepath("/var/run/console");
-	snprintf(line, LINE_SIZE, "/var/run/console/%s", username);
-	touch(line);
-
-#ifdef PAM_CONSOLE
-	if ((fd = open("/var/run/console/console.lock", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
-		write(fd, username, strlen(username));
-		close(fd);
-		system("/sbin/pam_console_apply");
-	}
-#endif
-
-	/*
-	 * Misc setup
-	 */
-	mkdir("/tmp/.X11-unix", 01777);
-	mkdir("/tmp/.ICE-unix", 01777);
-	umask(022);
-
-	system(GETTY "&");
-
-	_d("forking");
-	if (!fork()) {
-		/* child process */
-
-		vhangup();
-
-		close(2);
-		close(1);
-		close(0);
-
-		if (open("/dev/tty1", O_RDWR) != 0)
-			exit(1);
-
-		sigemptyset(&act.sa_mask);
-		act.sa_handler = SIG_DFL;
-
-		sigemptyset(&nmask2);
-		sigaddset(&nmask2, SIGCHLD);
-		sigprocmask(SIG_UNBLOCK, &nmask2, NULL);
-
-		for (i = 1; i < NSIG; i++)
-			sigaction(i, &sa, NULL);
-
-		dup2(0, 0);
-		dup2(0, 1);
-		dup2(0, 2);
-
-#ifdef USE_MESSAGE_BUS
-		_d("dbus");
-		mkdir("/var/run/dbus", 0755);
-		mkdir("/var/lock/subsys/messagebus", 0755);
-		system("dbus-uuidgen --ensure;dbus-daemon --system");
-#endif
-
-#ifdef LISTEN_INITCTL
-		listen_initctl();
-#endif
-
-		/* Prevents bash from running loadkeys */
-		unsetenv("TERM");
-
-		/* ConsoleKit needs this */
-		setenv("DISPLAY", ":0", 1);
-
-		while (access("/tmp/shutdown", F_OK) < 0) {
-			_d("start X as %s\n", username);
-			if (debug) {
-				snprintf(line, LINE_SIZE,
-					"su -l %s -c \"%s\"", username, startx);
-				system(line);
-				system("/bin/sh");
-			} else {
-				snprintf(line, LINE_SIZE,
-					"su -l %s -c \"%s\" &> /dev/null",
-					username, startx);
-				system(line);
-			}
-		}
-
-		exit(0);
-	}
-	
-	/* parent process */
-
-	
-	/* sleep(1); */
-	system("/usr/sbin/services.sh &>/dev/null&");
-
-	while (1) {
-		sigemptyset(&nmask);
-		pselect(0, NULL, NULL, NULL, NULL, &nmask);
-	}
-}
-
-
-/*
- * Shut down on INT USR1 USR2
- */
-void shutdown(int sig)
-{
-	touch("/tmp/shutdown");
-	if (sdown) {
-		system(sdown);
-	}
-
-	kill(-1, SIGTERM);
-
-	write(1, "\033[?25l\033[30;40m", 14);
-	copyfile("/boot/shutdown.fb", "/dev/fb/0", 0);
-	sleep(2);
-
-	system("/usr/sbin/alsactl store > /dev/null 2>&1");
-	system("/sbin/hwclock --systohc" HWCLOCK_DIRECTISA);
-
-	kill(-1, SIGKILL);
-
-	sync();
-	sync();
-	system("/bin/umount -a;/bin/mount -n -o remount,ro /");
-	//system("/sbin/unionctl.static / --remove / > /dev/null 2>&1");
-
-	if (sig == SIGINT || sig == SIGUSR1)
-		reboot(RB_AUTOBOOT);
-
-	reboot(RB_POWER_OFF);
-}
-
-
-/*
- * SIGCHLD: one of our children has died
- */
-void chld_handler(int sig)
-{
-	int status;
-
-	while (waitpid(-1, &status, WNOHANG) != 0) {
-		if (errno == ECHILD)
-			break;
-	}
-}
-

finit-mod.c

@@ -1,322 +0,0 @@
-/*
-Improved fast init
-
-Copyright (c) 2008 Claudio Matsuoka
-
-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.
-*/
-
-/*
-
-Changelog from the original Eeepc fastinit:
-
-- Use mknod() instead of close(open()) call to create empty file
-- Fix random seed initialization
-- Don't try to handle signal 0, SIGKILL or SIGSTOP
-- Implement makepath() to avoid system("mkdir -p")
-- Omit first hwclock if user has CONFIG_RTC_HCTOSYS in kernel (by Metalshark)
-- Add –directisa to hwclock if user has disabled CONFIG_GENRTC and enabled
-  CONFIG_RTC but not CONFIG_HPET_TIMER and CONFIG_HPET_RTC_IRQ (by Metalshark)
-- Drop system() call to clean /tmp, it's a fresh mounted tmpfs
-- Set loopback interface using direct calls instead of system("ifconfig")
-- Copy 4096 data block in C instead of system("cat") or system("dd")
-- Draw shutdown splash screen using C calls instead of system("echo;cat")
-- Change poweroff method to reboot(RB_POWER_OFF) (by Metalshark)
-- Mount /var/run and /var/lock as tmpfs
-- Use SIG_IGN instead of empty signal handler (by Metalshark)
-- Add built-in run-parts option to be used instead of system("run-parts")
-- Reuse cmdline buffer as hostname and filename buffers
-- Open terminal in vt2 using openvt
-
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/reboot.h>
-#include <sys/wait.h>
-#include <linux/fs.h>
-
-#include "helpers.h"
-
-#ifdef DIRECTISA
-#define HWCLOCK_DIRECTISA " --directisa"
-#else
-#define HWCLOCK_DIRECTISA
-#endif
-
-
-/* From sysvinit */
-/* Set a signal handler. */
-#define SETSIG(sa, sig, fun, flags) \
-		do { \
-			sa.sa_handler = fun; \
-			sa.sa_flags = flags; \
-			sigemptyset(&sa.sa_mask); \
-			sigaction(sig, &sa, NULL); \
-		} while (0)
-
-#define touch(x) mknod((x), S_IFREG|0644, 0)
-
-#define LINE_SIZE 1024
-
-void shutdown(int);
-void chld_handler(int);
-
-
-int main()
-{
-	int i;
-	FILE *f;
-	char line[LINE_SIZE];
-	int fd;
-	DIR *dir;
-	struct dirent *d;
-	struct sigaction sa, act;
-	char *x;
-	sigset_t nmask, nmask2;
-
-	puts("finit-mod " VERSION " (built " __DATE__ " " __TIME__
-						" by " WHOAMI ")");
-
-	chdir("/");
-	umask(022);
-	
-	/*
-	 * Signal management
-	 */
-	for (i = 1; i < NSIG; i++)
-		SETSIG(sa, i, SIG_IGN, SA_RESTART);
-
-	SETSIG(sa, SIGINT,  shutdown, 0);
-	SETSIG(sa, SIGPWR,  SIG_IGN, 0);
-	SETSIG(sa, SIGUSR1, shutdown, 0);
-	SETSIG(sa, SIGUSR2, shutdown, 0);
-	SETSIG(sa, SIGTERM, SIG_IGN, 0);
-	SETSIG(sa, SIGALRM, SIG_IGN, 0);
-	SETSIG(sa, SIGHUP,  SIG_IGN, 0);
-	SETSIG(sa, SIGCONT, SIG_IGN, SA_RESTART);
-	SETSIG(sa, SIGCHLD, chld_handler, SA_RESTART);
-	
-	/* Block sigchild while forking */
-	sigemptyset(&nmask);
-	sigaddset(&nmask, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &nmask, NULL);
-
-	reboot(RB_DISABLE_CAD);
-
-	/*
-	 * Parse kernel parameters
-	 */
-	if ((f = fopen("/proc/cmdline", "r")) != NULL) {
-		fgets(line, LINE_SIZE, f);
-		if (strstr(line, "quiet")) {
-			close(0);
-			close(1);
-			close(2);
-		}
-		fclose(f);
-	}
-
-	setsid();
-
-	/*
-	 * Mount filesystems
-	 */
-	mount("proc", "/proc", "proc", 0, NULL);
-	mount("sysfs", "/sys", "sysfs", 0, NULL);
-	mount("devpts", "/dev/pts", "devpts", 0, "gid=5,mode=620");
-	mount("tmpfs", "/dev/shm", "tmpfs", 0, NULL);
-	mount("tmpfs", "/tmp", "tmpfs", 0, "mode=1777,size=128m");
-	mount("tmpfs", "/var/run", "tmpfs", 0, "mode=0755");
-	mount("tmpfs", "/var/lock", "tmpfs", 0, "mode=1777");
-	mount("/mnt", "/", NULL, MS_MOVE, NULL);
-
-	/*
-	 * Time adjustments
-	 */
-	if ((fd = open("/etc/adjtime", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
-		write(fd, "0.0 0 0.0\n", 10);
-		close(fd);
-	}
-#ifndef NO_HCTOSYS
-	system("/sbin/hwclock --hctosys --localtime" HWCLOCK_DIRECTISA);
-#endif
-
-	/*
-	 * Network stuff
-	 */
-	makepath("/dev/shm/network");
-	makepath("/dev/shm/resolvconf/interface");
-
-	if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) {
-		while ((d = readdir(dir)) != NULL) {
-			if (isalnum(d->d_name[0]))
-				continue;
-			snprintf(line, LINE_SIZE,
-				"/etc/resolvconf/run/interface/%s", d->d_name);
-			unlink(line);
-		}
-
-		closedir(dir);
-	}
-
-	touch("/var/run/utmp");
-	touch("/etc/resolvconf/run/enable-updates");
-
-	chdir("/etc/resolvconf/run/interface");
-#ifdef BUILTIN_RUNPARTS
-	run_parts("/etc/resolvconf/update.d", "-i", NULL);
-#else
-	system("/bin/run-parts --arg=-i /etc/resolvconf/update.d");
-#endif
-	chdir("/");
-	
-	touch("/etc/network/run/ifstate");
-
-	if ((f = fopen("/etc/hostname", "r")) != NULL) {
-		fgets(line, LINE_SIZE, f);	
-		if ((x = strchr(line, 0x0a)) != NULL)
-			*x = 0;
-
-		sethostname(line, strlen(line)); 
-		fclose(f);
-		
-	}
-
-	ifconfig("lo", "127.0.0.1", "255.0.0.0", 1);
-
-	/*
-	 * Set random seed
-	 */
-	copyfile("/var/lib/urandom/random-seed", "/dev/urandom", 0);
-	unlink("/var/lib/urandom/random-seed");
-	umask(077);
-	copyfile("/dev/urandom", "/var/lib/urandom/random-seed", 4096);
-
-	/*
-	 * Misc setup
-	 */
-	unlink("/var/run/.clean");
-	unlink("/var/lock/.clean");
-	umask(0);
-	mkdir("/tmp/.X11-unix", 01777);
-	mkdir("/tmp/.ICE-unix", 01777);
-	umask(022);
-
-	system("/usr/bin/openvt /sbin/getty 38400 tty2&");
-
-	if (!fork()) {
-		/* child process */
-
-		vhangup();
-
-		close(2);
-		close(1);
-		close(0);
-
-		if (open("/dev/tty1", O_RDWR) != 0)
-			exit(1);
-
-		sigemptyset(&act.sa_mask);
-		act.sa_handler = SIG_DFL;
-
-		sigemptyset(&nmask2);
-		sigaddset(&nmask2, SIGCHLD);
-		sigprocmask(SIG_UNBLOCK, &nmask2, NULL);
-
-		for (i = 1; i < NSIG; i++)
-			sigaction(i, &sa, NULL);
-
-		dup2(0, 0);
-		dup2(0, 1);
-		dup2(0, 2);
-
-		touch("/tmp/nologin");
-		
-		while (access("/tmp/shutdown", F_OK) < 0)
-			system("su -c startx -l user &> /dev/null");
-
-		exit(0);
-	}
-	
-	/* parent process */
-
-	sleep(1);
-	system("/usr/sbin/services.sh &>/dev/null&");
-
-	while (1) {
-		sigemptyset(&nmask);
-		pselect(0, NULL, NULL, NULL, NULL, &nmask);
-	}
-}
-
-
-/*
- * Shut down on INT USR1 USR2
- */
-void shutdown(int sig)
-{
-	touch("/tmp/shutdown");
-
-	kill(-1, SIGTERM);
-
-	write(1, "\033[?25l\033[30;40m", 14);
-	copyfile("/boot/shutdown.fb", "/dev/fb/0", 0);
-	sleep(2);
-
-	system("/usr/sbin/alsactl store > /dev/null 2>&1");
-	system("/sbin/hwclock --systohc --localtime" HWCLOCK_DIRECTISA);
-
-	kill(-1, SIGKILL);
-
-	sync();
-	sync();
-	system("/bin/mount -n -o remount,ro /");
-	system("/sbin/unionctl.static / --remove / > /dev/null 2>&1");
-
-	if (sig == SIGINT || sig == SIGUSR1)
-		reboot(RB_AUTOBOOT);
-
-	reboot(RB_POWER_OFF);
-}
-
-
-/*
- * SIGCHLD: one of our children has died
- */
-void chld_handler(int sig)
-{
-	int status;
-
-	while (waitpid(-1, &status, WNOHANG) != 0) {
-		if (errno == ECHILD)
-			break;
-	}
-}
-

finit.c

@@ -1,282 +1,204 @@
+/* Improved fast init
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
 #include <sys/mount.h>
-#include <sys/types.h>
+#include <ctype.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include <dirent.h>
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <sys/reboot.h>
-#include <sys/wait.h>
 #include <linux/fs.h>
+#include <sys/stat.h>		/* umask(), mkdir() */
+
+#include "finit.h"
+#include "helpers.h"
+#include "private.h"
+#include "plugin.h"
+#include "svc.h"
+#include "signal.h"
+
+int   debug    = 0;
+int   verbose  = 1;
+char *sdown    = NULL;
+char *network  = NULL;
+char *username = NULL;
+char *hostname = NULL;
 
 
-/* From sysvinit */
+static void parse_kernel_cmdline(void)
-/* Set a signal handler. */
-#define SETSIG(sa, sig, fun, flags) \
-		do { \
-			sa.sa_handler = fun; \
-			sa.sa_flags = flags; \
-			sigemptyset(&sa.sa_mask); \
-			sigaction(sig, &sa, NULL); \
-		} while(0)
-
-#define touch(x) close(open((x), O_CREAT|O_WRONLY|O_TRUNC, 0644))
-
-
-void shutdown(int);
-void signal_handler(int);
-void chld_handler(int);
-
-
-int main()
 {
-	int i;
+	FILE *fp;
-	FILE *f;
+	char line[LINE_SIZE];
-	char line[2096];
-	int fd;
-	DIR *dir;
-	struct dirent *d;
-	char filename[1024];
-	struct sigaction sa, act;
-	char hline[1024];
-	char *x;
-	sigset_t nmask, nmask2;
 
-	chdir("/");
+	if ((fp = fopen("/proc/cmdline", "r")) != NULL) {
-	umask(022);
+		fgets(line, sizeof(line), fp);
-	
+
+		if (strstr(line, "finit_debug") || strstr(line, "--debug"))
+			debug = 1;
+
+		if (!debug && strstr(line, "quiet"))
+			verbose = 0;
+
+		fclose(fp);
+	}
+}
+
+static int run_loop(void)
+{
+	while (1) {
+		svc_monitor();
+		io_monitor();
+	}
+
+	return 0;
+}
+
+int main(int UNUSED(args), char *argv[])
+{
 	/*
-	 * Signal management
+	 * Initial setup of signals, ignore all until we're up.
 	 */
-	for (i = 1; i < NSIG; i++)
+	sig_init();
-		SETSIG(sa, i, SIG_IGN, SA_RESTART);
 
-	SETSIG(sa, SIGINT,  shutdown,       0);
+	/*
-	SETSIG(sa, SIGPWR,  signal_handler, 0);
+	 * Mount base file system, kernel is assumed to run devtmpfs for /dev
-	SETSIG(sa, SIGUSR1, shutdown,       0);
+	 */
-	SETSIG(sa, SIGUSR2, shutdown,       0);
+	chdir("/");
-	SETSIG(sa, SIGTERM, signal_handler, 0);
+	umask(0);
-	SETSIG(sa, SIGKILL, signal_handler, 0);
+	mount("none", "/proc", "proc", 0, NULL);
-	SETSIG(sa, SIGALRM, signal_handler, 0);
+	mount("none", "/proc/bus/usb", "usbfs", 0, NULL);
-	SETSIG(sa, SIGHUP,  signal_handler, 0);
+	mount("none", "/sys", "sysfs", 0, NULL);
-	SETSIG(sa, SIGSTOP, signal_handler, SA_RESTART);
+	mkdir("/dev/pts", 0755);
-	SETSIG(sa, SIGCONT, signal_handler, SA_RESTART);
+	mkdir("/dev/shm", 0755);
-	SETSIG(sa, SIGCHLD, chld_handler,   SA_RESTART);
+	mount("none", "/dev/pts", "devpts", 0, "gid=5,mode=620");
-	
+	mount("none", "/dev/shm", "tmpfs", 0, NULL);
-	/* Block sigchild while forking */
+	umask(022);
-	sigemptyset(&nmask);
-	sigaddset(&nmask, SIGCHLD);
-	sigprocmask(SIG_BLOCK, &nmask, NULL);
 
-	reboot(RB_DISABLE_CAD);
+	/*
+	 * 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
 
 	/*
 	 * Parse kernel parameters
 	 */
-	if ((f = fopen("/proc/cmdline", "r")) != NULL) {
+	parse_kernel_cmdline();
-		fgets(line, 2095, f);
-		if (strstr(line, "quiet")) {
-			close(0);
-			close(1);
-			close(2);
-		}
-		fclose(f);
-	}
 
-	setsid();
+	cls();
+	echo("finit " VERSION " (built " __DATE__ " " __TIME__ " by " WHOAMI ")");
+
+	/*
+	 * Parse configuration file
+	 */
+	parse_finit_conf(FINIT_CONF);
 
 	/*
 	 * Mount filesystems
 	 */
-	mount("proc", "/proc", "proc", 0, NULL);
+	_d("Mount filesystems in /etc/fstab ...");
-	mount("sysfs", "/sys", "sysfs", 0, NULL);
+
-	mount("devpts", "/dev/pts", "devpts", 0, "gid=5,mode=620");
+#ifdef REMOUNT_ROOTFS_RW
-	mount("tmpfs", "/dev/shm", "tmpfs", 0, NULL);
+	run("/bin/mount -n -o remount,rw /");
-	mount("tmpfs", "/tmp", "tmpfs", 0, "mode=1777,size=128m");
+#endif
-	mount("/mnt", "/", NULL, MS_MOVE, NULL);
+#ifdef SYSROOT
+	run(SYSROOT, "/", NULL, MS_MOVE, NULL);
+#endif
+	umask(0);
+	run("/bin/mount -na");
+	run("/sbin/swapon -ea");
+	umask(0022);
+
+	/* Cleanup stale files, if any still linger on. */
+	run_interactive("rm -rf /tmp/* /var/run/* /var/lock/*", "Cleanup temporary directories");
 
 	/*
-	 * Time adjustments
+	 * Base FS up, enable standard SysV init signals
 	 */
-	if ((fd = open("/etc/adjtime", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
+	sig_setup();
-		write(fd, "0.0 0 0.0\n", 10);
+
-		close(fd);
+	/*
-	}
+	 * Load plugins and run first level hooks.
-	system("/sbin/hwclock --hctosys --localtime");
+	 */
+	_d("Loading plugins ...");
+	load_plugins(PLUGIN_PATH);
+
+	_d("Running first level hooks ...");
+	run_hooks(HOOK_BASEFS_UP);
 
 	/*
 	 * Network stuff
 	 */
-	system("mkdir -p /dev/shm/network");
-	system("mkdir -p /dev/shm/resolvconf/interface");
 
-	if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) {
+	/* Setup kernel specific settings, e.g. allow broadcast ping, etc. */
-		while ((d = readdir(dir)) != NULL) {
+	run("/sbin/sysctl -e -p /etc/sysctl.conf >/dev/null");
-			if (isalnum(d->d_name[0]))
-				continue;
-			sprintf(filename, "/etc/resolvconf/run/interface/%s",
-								d->d_name);
-			unlink(filename);
-		}
 
-		closedir(dir);
+	/* Set initial hostname. */
-	}
+	set_hostname(hostname);
 
-	touch("/var/run/utmp");
+	ifconfig("lo", "127.0.0.1", "255.0.0.0", 1);
-	touch("/etc/resolvconf/run/enable-updates");
+	if (network)
-
+		run_interactive(network, "Starting networking: %s", network);
-	chdir("/etc/resolvconf/run/interface");
-	system("/bin/run-parts --arg=-i /etc/resolvconf/update.d");
-	chdir("/");
-	
-	touch("/etc/network/run/ifstate");
-
-	if ((f = fopen("/etc/hostname", "r")) != NULL) {
-		fgets(hline, 1023, f);	
-		if ((x = strchr(hline, 0x0a)) != NULL)
-			*x = 0;
-
-		sethostname(hline, strlen(hline)); 
-		fclose(f);
-		
-	}
-
-	system("/sbin/ifconfig lo 127.0.0.1 netmask 255.0.0.0 up > /dev/null");
-
-	/*
-	 * Set random seed
-	 */
-	/* Bug: the eeepc never sets its random seed from file */
-	system("/bin/cat /var/lib/urandom/random-seed >/dev/urandom "
-						"> /dev/null 2>&1");
-	unlink("/var/lib/urandom/random-seed");
-
-	umask(077);
-	system("/bin/dd if=/dev/urandom of=/var/lib/urandom/random-seed "
-					"bs=4096 count=1 >/dev/null 2>&1");
-
-	/*
-	 * Misc setup
-	 */
-	/* not really needed, /tmp is a fresh mounted tmpfs */
-	system("/bin/rm -rf /tmp/* /tmp/.* 2>/dev/null");
-
-	unlink("/var/run/.clean");
-	unlink("/var/lock/.clean");
-	umask(0);
-	mkdir("/tmp/.X11-unix", 01777);
-	mkdir("/tmp/.ICE-unix", 01777);
 	umask(022);
 
-	if (!fork()) {
+	/*
-		/* child process */
+	 * Hooks that rely on loopback, or basic networking being up.
+	 */
+	run_hooks(HOOK_NETWORK_UP);
 
-		vhangup();
+	/*
+	 * Start service monitor framework
+	 */
+	_d("Starting all static services from %s", FINIT_CONF);
+	svc_start_all();
 
-		close(2);
+	/*
-		close(1);
+	 * Run startup scripts in /etc/finit.d/, if any.
-		close(0);
+	 */
+	_d("Running startup scripts in /etc/finit.d/ ...");
+	run_parts(FINIT_RCSD);
 
-		if (open("/dev/tty1", O_RDWR, 0))
+	/*
-			exit(1);
+	 * Hooks that should run at the very end
+	 */
+	run_hooks(HOOK_SYSTEM_UP);
 
-		sigemptyset(&act.sa_mask);
+	/* Start GETTY on console */
-		act.sa_handler = SIG_DFL;
+	_d("Starting getty on console ...");
+	run_getty(GETTY, argv);
 
-		sigemptyset(&nmask2);
+	/*
-		sigaddset(&nmask2, SIGCHLD);
+	 * Enter main loop to monior /dev/initctl and services
-		sigprocmask(SIG_UNBLOCK, &nmask2, NULL);
+	 */
-
+	_d("Entering main loop ...");
-		/* Bug: no signal 0 */
+	return run_loop();
-		for (i = 0; i < NSIG; i++)
-			sigaction(i, &sa, NULL);
-
-		dup2(0, 0);
-		dup2(0, 1);
-		dup2(0, 2);
-
-		touch("/tmp/nologin");
-		
-		while (access("/tmp/shutdown", F_OK) < 0)
-			system("su -c startx -l user &> /dev/null");
-
-		exit(0);
-	}
-	
-	/* parent process */
-
-	system("/sbin/getty 38400 tty3 &");
-	sleep(1);
-	system("/usr/sbin/services.sh &> /dev/null &");
-
-	while (1) {
-		sigemptyset(&nmask);
-		pselect(0, NULL, NULL, NULL, NULL, &nmask);
-	}
 }
 
-
+/**
-/*
+ * Local Variables:
- * Shut down on INT USR1 USR2
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
  */
-void shutdown(int sig)
-{
-	int fd;
-
-	system("/usr/bin/touch /tmp/shutdown");
-
-	kill(-1, SIGTERM);
-
-	system("/bin/echo -e \"\033[?25l\033[30;40m\"; "
-				"/bin/cp /boot/shutdown.fb /dev/fb/0");
-	sleep(1);
-	sleep(1);
-
-	system("/usr/sbin/alsactl store > /dev/null 2>&1");
-	system("/sbin/hwclock --systohc --localtime");
-
-	kill(-1, SIGKILL);
-
-	sync();
-	sync();
-	system("/bin/mount -n -o remount,ro /");
-	system("/sbin/unionctl.static / --remove / > /dev/null 2>&1");
-
-	if (sig == SIGINT || sig == SIGUSR1)
-		reboot(RB_AUTOBOOT);
-
-	if ((fd = open("/proc/acpi/sleep", O_WRONLY)) >= 0) {
-		write(fd, "5", 1);
-		close(fd);
-	}
-}
-
-
-/*
- * SIGCHLD: one of our children has died
- */
-void chld_handler(int sig)
-{
-	int status;
-
-	while (waitpid(-1, &status, WNOHANG) != 0) {
-		if (errno == ECHILD)
-			break;
-	}
-}
-
-
-/*
- * We got a signal (PWR TERM ALRM HUP STOP CONT)
- */
-void signal_handler(int sig)
-{
-	/* do nothing */
-}
-

finit.conf

@@ -1,6 +0,0 @@
-user fred
-module intel-agp
-module p4-clockmod
-check /dev/sda3
-host eviltwin
-startx /usr/bin/startx

finit.h

@@ -0,0 +1,126 @@
+/* Improved fast init
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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_H_
+#define FINIT_H_
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <syslog.h>
+#define DO_LOG(level, fmt, args...)				\
+{								\
+	openlog("finit", LOG_CONS | LOG_PID, LOG_DAEMON);	\
+	syslog(LOG_DEBUG, fmt, ##args);				\
+	closelog();						\
+}
+
+#define DEBUG(fmt, args...)  DO_LOG(LOG_DEBUG, fmt, ##args)
+#define ERROR(fmt, args...)  DO_LOG(LOG_CRIT, fmt, ##args)
+
+#define FINIT_FIFO "/dev/initctl"
+#define FINIT_CONF "/etc/finit.conf"
+#define FINIT_RCSD "/etc/finit.d"
+
+/* Distribution configuration */
+
+#if defined EMBEDDED_SYSTEM
+# define CONSOLE        "/dev/console"
+# define MDEV           "/sbin/mdev"
+# define GETTY          "/sbin/getty -L 115200 ttyS0 vt100"
+# define LISTEN_INITCTL
+#else /* Debian/Ubuntu based distributions */
+# define RANDOMSEED	"/var/lib/urandom/random-seed"
+# define CONSOLE        "/dev/tty1"
+# define GETTY		"/sbin/getty -8 38400 tty1"
+# define REMOUNT_ROOTFS_RW
+# define RUNLEVEL	2
+# define LISTEN_INITCTL
+# define USE_UDEV
+# define USE_MESSAGE_BUS
+#endif
+
+#ifndef DEFUSER
+# define DEFUSER "root"
+#endif
+#ifndef DEFHOST
+# define DEFHOST "noname"
+#endif
+
+#define CMD_SIZE  256
+#define LINE_SIZE 1024
+#define BUF_SIZE  4096
+#define USERNAME_SIZE 16
+#define HOSTNAME_SIZE 32
+
+#ifndef touch
+# define touch(x) mknod((x), S_IFREG|0644, 0)
+#endif
+#ifndef chardev
+# define chardev(x,m,maj,min) mknod((x), S_IFCHR|(m), makedev((maj),(min)))
+#endif
+#ifndef blkdev
+# define blkdev(x,m,maj,min) mknod((x), S_IFBLK|(m), makedev((maj),(min)))
+#endif
+#ifndef fexist
+# define fexist(x) (access(x, F_OK) != -1)
+#endif
+
+#ifndef UNUSED
+#define UNUSED(x) UNUSED_ ## x __attribute__ ((unused))
+#endif
+
+#define echo(fmt, args...) do { if (1) { fprintf(stderr, fmt "\n",  ##args); } } while (0)
+#define _d(fmt, args...)   do { if (debug)   { fprintf(stderr, "finit:%s() - " fmt "\n", __func__, ##args); } } while (0)
+#define _e(fmt, args...)   do { fprintf(stderr, "finit:%s() - " fmt "\n", __func__, ##args); } while (0)
+#define _pe(fmt, args...)  do { fprintf(stderr, "finit:%s() - " fmt ". Error %d: %s\n", __func__, ##args, errno, strerror(errno)); } while (0)
+
+extern int   debug;
+extern int   verbose;
+extern char *sdown;
+extern char *network;
+extern char *hostname;
+extern char *username;
+
+/* strlcpy.c */
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
+/* conf.c */
+void parse_finit_conf(char *file);
+
+
+#endif /* FINIT_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

helpers.c

@@ -1,4 +1,28 @@
+/* Misc. utility functions and C-library extensions to simplify finit system setup.
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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 <ctype.h>		/* isdigit() */
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -7,20 +31,26 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#include <sys/prctl.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#ifdef BUILTIN_RUNPARTS
 #include <dirent.h>
 #include <stdarg.h>
 #include <sys/wait.h>
-#endif
 
 #include <grp.h>
+#include <pwd.h>
 
+#include "finit.h"
 #include "helpers.h"
+#include "private.h"
+#include "signal.h"
+
+#define NUM_ARGS    16
+#define NUM_SCRIPTS 128		/* ought to be enough for anyone */
 
 /*
  * Helpers to replace system() calls
@@ -52,7 +82,7 @@ void ifconfig(char *name, char *inet, char *mask, int up)
 		return;
 
 	memset(&ifr, 0, sizeof (ifr));
-	strncpy(ifr.ifr_name, name, IFNAMSIZ);
+	strlcpy(ifr.ifr_name, name, IFNAMSIZ);
 	a->sin_family = AF_INET;
 
 	if (up) {
@@ -74,7 +104,6 @@ void ifconfig(char *name, char *inet, char *mask, int up)
 	close(sock);
 }
 
-#define BUF_SIZE 4096
 
 void copyfile(char *src, char *dst, int size)
 {
@@ -100,10 +129,249 @@ void copyfile(char *src, char *dst, int size)
 	}
 }
 
-#ifdef BUILTIN_RUNPARTS
+static int print_uptime(void)
+{
+#if defined(CONFIG_PRINTK_TIME)
+	FILE * uptimefile;
+	float num1, num2;
+	char uptime_str[30];
 
-#define NUM_SCRIPTS 128		/* ought to be enough for anyone */
+	if((uptimefile = fopen("/proc/uptime", "r")) == NULL)
-#define NUM_ARGS 16
+		return 1;
+
+	fgets(uptime_str, 20, uptimefile);
+	fclose(uptimefile);
+
+	sscanf(uptime_str, "%f %f", &num1, &num2);
+	sprintf(uptime_str, "[ %.6f ]", num1);
+
+	write(STDERR_FILENO, uptime_str, strlen(uptime_str));
+#endif
+	return 0;
+}
+
+void print_descr(char *action, char *descr)
+{
+	const char home[] = "\r\e[K";
+	const char dots[] = " .....................................................................";
+
+	write(STDERR_FILENO, home, strlen(home));
+
+	print_uptime();
+
+	write(STDERR_FILENO, action, strlen(action));
+	write(STDERR_FILENO, descr, strlen(descr));
+	write(STDERR_FILENO, dots, 60 - strlen(descr) - strlen(action)); /* pad with dots. */
+}
+
+int print_result(int fail)
+{
+	if (fail)
+		fprintf(stderr, " \e[7m[FAIL]\e[0m\n");
+	else
+		fprintf(stderr, " \e[1m[ OK ]\e[0m\n");
+
+	return fail;
+}
+
+int run(char *cmd)
+{
+	int status, result, i = 0;
+	FILE *fp;
+	char *args[NUM_ARGS + 1], *arg, *backup;
+	pid_t pid;
+
+	/* We must create a copy that is possible to modify. */
+	backup = arg = strdup(cmd);
+	if (!arg)
+		return 1; /* Failed allocating a string to be modified. */
+
+	/* Split command line into tokens of an argv[] array. */
+	args[i++] = strsep(&arg, "\t ");
+	do {
+		/* Handle run("su -c \"dbus-daemon --system\" messagebus");
+		 *   => "su", "-c", "\"dbus-daemon --system\"", "messagebus" */
+		if (*arg == '\'' || *arg == '"') {
+			char *p, delim[2] = " ";
+
+			delim[0]  = arg[0];
+			args[i++] = arg++;
+			strsep(&arg, delim);
+			 p     = arg - 1;
+			*p     = *delim;
+			*arg++ = 0;
+		} else {
+			args[i++] = strsep(&arg, "\t ");
+		}
+	} while (arg && i < NUM_ARGS);
+	args[i] = NULL;
+#if 0
+	_e("Splitting: '%s' =>", cmd);
+	for (i = 0; args[i]; i++)
+		_e("\t%s", args[i]);
+#endif
+	if (i == NUM_ARGS && args[i]) {
+		_e("Command too long: %s", cmd);
+		free(backup);
+		errno = EOVERFLOW;
+		return 1;
+	}
+
+	fp = fopen("/dev/null", "w");
+	pid = fork();
+	if (0 == pid) {
+		int i;
+		struct sigaction sa;
+
+		/* Reset signal handlers that were set by the parent process */
+                for (i = 1; i < NSIG; i++)
+			DFLSIG(sa, i, 0);
+
+		/* Redirect stdio if the caller requested so. */
+		if (fp) {
+			int fd = fileno(fp);
+
+			dup2(fd, STDIN_FILENO);
+			dup2(fd, STDOUT_FILENO);
+			dup2(fd, STDERR_FILENO);
+		}
+
+		execvp(args[0], args);
+		_exit(1); /* Only if execv() fails. */
+	} else if (-1 == pid) {
+		_pe("%s", args[0]);
+		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));
+
+		if (fp) fclose(fp);
+		free(backup);
+
+		return 1;
+	}
+
+	result = WEXITSTATUS(status);
+	if (WIFEXITED(status)) {
+		_d("Started %s and ended OK: %d", args[0], result);
+	} else if (WIFSIGNALED(status)) {
+		_d("Process %s terminated by signal %d", args[0], WTERMSIG(status));
+		if (!result)
+			result = 1; /* Must alert callee that the command did complete successfully.
+				     * This is necessary since not all programs trap signals and
+				     * change their return code accordingly. --Jocke */
+	}
+
+	if (fp) fclose(fp);
+	free(backup);
+
+	return result;
+}
+
+int run_interactive(char *cmd, char *fmt, ...)
+{
+	int status, oldout = 1, olderr = 2;
+	char line[LINE_SIZE];
+	va_list ap;
+	FILE *fp = tmpfile();
+
+	va_start(ap, fmt);
+	vsnprintf(line, sizeof(line), fmt, ap);
+	va_end(ap);
+
+	print_descr("", line);
+	if (fp && !debug) {
+		oldout = dup(STDOUT_FILENO);
+		olderr = dup(STDERR_FILENO);
+		dup2(fileno(fp), STDOUT_FILENO);
+		dup2(fileno(fp), STDERR_FILENO);
+	}
+	status = run(cmd);
+	if (fp && !debug) {
+		dup2(oldout, STDOUT_FILENO);
+		dup2(olderr, STDERR_FILENO);
+	}
+	print_result(status);
+	if (fp && !debug) {
+		size_t len, written;
+
+		rewind(fp);
+		do {
+			len     = fread(line, 1, sizeof(line), fp);
+			written = fwrite(line, len, sizeof(char), stderr);
+		} while (len > 0 && written == len);
+		fclose(fp);
+	}
+
+	return status;
+}
+
+pid_t run_getty(char *cmd, char *argv[])
+{
+	pid_t pid = fork();
+
+	if (!pid) {
+		int i;
+		char c;
+		sigset_t nmask;
+		struct sigaction sa;
+
+		/* Detach from initial controlling TTY */
+		vhangup();
+
+		close(2);
+		close(1);
+		close(0);
+
+		/* Attach TTY to console */
+		if (open(CONSOLE, O_RDWR) != 0)
+			exit(1);
+
+		sigemptyset(&sa.sa_mask);
+		sa.sa_handler = SIG_DFL;
+
+		sigemptyset(&nmask);
+		sigaddset(&nmask, SIGCHLD);
+		sigprocmask(SIG_UNBLOCK, &nmask, NULL);
+
+		for (i = 1; i < NSIG; i++)
+			sigaction(i, &sa, NULL);
+
+		dup2(0, STDIN_FILENO);
+		dup2(0, STDOUT_FILENO);
+		dup2(0, STDERR_FILENO);
+
+		set_procname(argv, "console");
+
+		while (!fexist(SYNC_SHUTDOWN)) {
+			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 (fexist(SYNC_STOPPED))
+				continue;
+
+			run(cmd);
+		}
+
+		exit(0);
+	}
+
+	return pid;
+}
 
 static int cmp(const void *s1, const void *s2)
 {
@@ -115,16 +383,21 @@ int run_parts(char *dir, ...)
 	DIR *d;
 	struct dirent *e;
 	struct stat st;
+	char *oldpwd = NULL;
 	char *ent[NUM_SCRIPTS];
 	int i, num = 0, argnum = 1;
 	char *args[NUM_ARGS];
 	va_list ap;
 
-	if (chdir(dir))
+	oldpwd = getcwd (NULL, 0);
+	if (chdir(dir)) {
+		if (oldpwd) free(oldpwd);
 		return -1;
-
+	}
-	if ((d = opendir(dir)) == NULL)
+	if ((d = opendir(dir)) == NULL) {
+		if (oldpwd) free(oldpwd);
 		return -1;
+	}
 
 	va_start(ap, dir);
 	while (argnum < NUM_ARGS && (args[argnum++] = va_arg(ap, char *)));
@@ -132,6 +405,7 @@ int run_parts(char *dir, ...)
 
 	while ((e = readdir(d))) {
 		if (e->d_type == DT_REG && stat(e->d_name, &st) == 0) {
+			_d("Found %s/%s ...", dir, e->d_name);
 			if (st.st_mode & S_IXUSR) {
 				ent[num++] = strdup(e->d_name);
 				if (num >= NUM_SCRIPTS)
@@ -142,24 +416,46 @@ int run_parts(char *dir, ...)
 
 	closedir(d);
 
-	if (num == 0)
+	if (num == 0) {
+		if (oldpwd) free(oldpwd);
 		return 0;
+	}
 
 	qsort(ent, num, sizeof(char *), cmp);
 
 	for (i = 0; i < num; i++) {
+		pid_t pid = 0;
+		int status;
+
 		args[0] = ent[i];
-		if (!fork()) {
+		args[1] = NULL;
+
+		pid = fork();
+		if (!pid) {
+			_d("Calling %s ...", ent[i]);
 			execv(ent[i], args);
 			exit(0);
 		}
-		wait(NULL);
+		waitpid(pid, &status, 0);
 		free(ent[i]);
 	}
 
+	chdir(oldpwd);
+	free(oldpwd);
+
 	return 0;
 }
 
+int getuser(char *s)
+{
+	struct passwd *usr;
+
+	if (!s || (usr = getpwnam(s)) == NULL)
+		return -1;
+
+	return usr->pw_uid;
+}
+
 int getgroup(char *s)
 {
 	struct group *grp;
@@ -174,6 +470,14 @@ int getgroup(char *s)
  * Other convenience functions
  */
 
+void cls(void)
+{
+	static const char cls[] = "\e[2J\e[1;1H";
+
+	if (!debug)
+		fprintf (stderr, "%s", cls);
+}
+
 void chomp(char *s)
 {
 	char *x;
@@ -182,4 +486,132 @@ void chomp(char *s)
 		*x = 0;
 }
 
-#endif
+void set_procname(char *args[], char *name)
+{
+	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);
+}
+
+/**
+ * get_pidname - Find name of a process
+ * @pid:  PID of process to find.
+ * @name: Pointer to buffer where to return process name, may be %NULL
+ * @len:  Length in bytes of @name buffer.
+ *
+ * If @name is %NULL, or @len is zero the function will return
+ * a static string.  This may be useful to one-off calls.
+ *
+ * Returns:
+ * %NULL on error, otherwise a va
+ */
+char *get_pidname(pid_t pid, char *name, size_t len)
+{
+	int ret = 1;
+	FILE *fp;
+	char path[32];
+	static char line[64];
+
+	if (!name || len == 0)
+		name = line;
+
+	snprintf(path, sizeof(path), "/proc/%d/status", pid);
+	if ((fp = fopen(path, "r")) != NULL) {
+		if (fgets(line, sizeof (line), fp)) {
+			char *pname = line + 6; /* Skip first part of line --> "Name:\t" */
+
+			chomp(pname);
+			strlcpy(name, pname, len);
+			ret = 0;		 /* Found it! */
+		}
+
+		fclose(fp);
+	}
+
+	if (ret)
+		return NULL;
+
+	return name;
+}
+
+/**
+ * kill_procname - Send a signal to a process group by name.
+ * @name: Name of process to send signal to.
+ * @signo: Signal to send.
+ *
+ * Send a signal to a running process (group). This function searches
+ * for a given process @name and sends a signal, @signo, to each
+ * process ID matching that @name.
+ *
+ * Returns:
+ * Number of signals sent, i.e. number of processes who have received the signal.
+ */
+int kill_procname (const char *name, int signo)
+{
+	int result = 0;
+	char path[32], line[64];
+	FILE *fp;
+	DIR *dir;
+	struct dirent *entry;
+
+	dir = opendir("/proc");
+	if (!dir || !name) {
+		errno = EINVAL;
+		return 0;
+	}
+
+	while ((entry = readdir (dir)) != NULL) {
+		/* Skip non-process entries in /proc */
+		if (!isdigit (*entry->d_name))
+			continue;
+
+		snprintf (path, sizeof(path), "/proc/%s/status", entry->d_name);
+		/* Skip non-readable files (protected?) */
+		if ((fp = fopen (path, "r")) == NULL)
+			continue;
+
+		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) {
+				int error = errno;
+
+				if (kill(atoi(entry->d_name), signo)) {
+					ERROR("Failed signalling(%d) %s: %s!", signo, name, strerror(error));
+				} else {
+					result++; /* Track number of processes we deliver the signal to. */
+				}
+			}
+		}
+
+		fclose(fp);
+	}
+
+	closedir(dir);
+
+	return result;
+}
+
+void set_hostname(char *hostname)
+{
+	FILE *fp;
+
+	_d("Set hostname: %s", hostname);
+	if ((fp = fopen("/etc/hostname", "r")) != NULL) {
+		fgets(hostname, HOSTNAME_SIZE, fp);
+		chomp(hostname);
+		fclose(fp);
+	}
+
+	sethostname(hostname, strlen(hostname));
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

helpers.h

@@ -1,14 +1,56 @@
-#ifndef __FINIT_HELPERS_H
+/* Misc. utility functions and C-library extensions to simplify finit system setup.
-#define __FINIT_HELPERS_H
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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_HELPERS_H_
+#define FINIT_HELPERS_H_
 
 int	makepath	(char *);
 void	ifconfig	(char *, char *, char *, int);
 void	copyfile	(char *, char *, int);
+void    print_descr     (char *action, char *descr);
+int     print_result    (int fail);
+int     start_process   (char *cmd, char *args[], int console);
+void    cls             (void);
 void	chomp		(char *);
+int     getuser         (char *);
 int	getgroup	(char *);
+void    set_procname    (char *args[], char *name);
+char   *get_pidname     (pid_t pid, char *name, size_t len);
+int     kill_procname   (const char *name, int signo);
+void    set_hostname    (char *hostname);
 
-#ifdef BUILTIN_RUNPARTS
+int     run             (char *cmd);
-int	run_parts	(char *, ...);
+int     run_interactive (char *cmd, char *fmt, ...);
-#endif
+pid_t   run_getty       (char *cmd, char *argv[]);
+int	run_parts	(char *dir, ...);
 
-#endif
+#endif /* FINIT_HELPERS_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugin.c

@@ -0,0 +1,222 @@
+/* Plugin based services architecture for finit
+ *
+ * Copyright (c) 2012  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 <dlfcn.h>		/* dlopen() et al */
+#include <dirent.h>		/* readdir() et al */
+#include <poll.h>
+#include <string.h>
+#include <sys/queue.h>		/* BSD sys/queue.h API */
+
+#include "finit.h"
+#include "private.h"
+#include "helpers.h"
+#include "plugin.h"
+#include "svc.h"
+
+#define is_io_plugin(p) ((p)->io.cb && (p)->io.fd >= 0)
+
+static size_t        num_fds = 0;
+static struct pollfd fds[MAX_NUM_FDS];
+static LIST_HEAD(, plugin) plugins = LIST_HEAD_INITIALIZER();
+
+int plugin_register(plugin_t *plugin)
+{
+	int inuse = 0;
+
+	if (!plugin) {
+		errno = EINVAL;
+		return 1;
+	}
+
+	if (!plugin->name) {
+		Dl_info info;
+
+		if (!dladdr(plugin, &info) || !info.dli_fname)
+			plugin->name = "unknown";
+		else
+			plugin->name = (char *)info.dli_fname;
+	}
+
+	if (is_io_plugin(plugin)) {
+		if (num_fds + 1 >= MAX_NUM_FDS) {
+			num_fds = MAX_NUM_SVC;
+			errno = ENOMEM;
+			return 1;
+		}
+		num_fds++;
+		inuse++;
+	}
+
+	if (plugin->svc.cb) {
+		svc_t *svc = svc_find_by_name(plugin->name);
+
+		if (svc) {
+			plugin->svc.id = svc_id(svc);
+			svc->plugin    = &plugin->svc;
+			inuse++;
+		}
+	}
+
+	if (!inuse) {
+		_e("No service \"%s\" loaded, skipping plugin.", basename(plugin->name));
+		return 1;
+	}
+
+	LIST_INSERT_HEAD(&plugins, plugin, link);
+
+	return 0;
+}
+
+int plugin_unregister(plugin_t *plugin)
+{
+	LIST_REMOVE(plugin, link);
+
+	/* XXX: Unfinished, add cleanup code here! */
+
+	return 0;
+}
+
+/* Private daemon API *******************************************************/
+void run_hooks(hook_point_t no)
+{
+	plugin_t *p;
+
+	PLUGIN_ITERATOR(p) {
+		if (p->hook[no].cb) {
+			_d("Calling %s hook n:o %d from runloop...", basename(p->name), no);
+			p->hook[no].cb(p->hook[no].arg);
+		}
+	}
+}
+
+void run_services(void)
+{
+	plugin_t *p;
+
+	PLUGIN_ITERATOR(p) {
+		if (p->svc.cb) {
+			_d("Calling svc %s from runloop...", basename(p->name));
+			p->svc.cb(p->svc.arg, 0);
+		}
+	}
+}
+
+/* Generic libev I/O callback, looks up correct plugin and calls its callback */
+static void generic_io_cb(int fd, int events)
+{
+	plugin_t *p;
+
+	/* Find matching plugin, pick first matching fd */
+	PLUGIN_ITERATOR(p) {
+		if (is_io_plugin(p) && p->io.fd == fd) {
+			_d("Calling I/O %s from runloop...", basename(p->name));
+			p->io.cb(p->io.arg, fd, events);
+			break;
+		}
+	}
+}
+
+void io_monitor(void)
+{
+	int ret;
+	size_t i;
+
+	while ((ret = poll(fds, num_fds, 500))) {
+		if (-1 == ret) {
+			if (EINTR == errno)
+				continue;
+
+			_e("Failed polling I/O plugin descriptors, error %d: %s",
+			   errno, strerror(errno));
+			break;
+		}
+
+		/* 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);
+		}
+
+		break;
+	}
+}
+
+/* Setup any I/O callbacks for plugins that use them */
+static void init_plugins(void)
+{
+	int i = 0;
+	plugin_t *p;
+
+	PLUGIN_ITERATOR(p) {
+		if (is_io_plugin(p)) {
+			_d("Initializing plugin %s for I/O", basename(p->name));
+			fds[i].revents    = 0;
+			fds[i].events     = p->io.flags;
+			fds[num_fds++].fd = p->io.fd;
+		}
+	}
+}
+
+int load_plugins(char *path)
+{
+	DIR *dp = opendir(path);
+	struct dirent *entry;
+
+	if (!dp) {
+		_e("Failed, cannot open plugin directory %s: %s", path, strerror(errno));
+		return 1;
+	}
+
+	while ((entry = readdir(dp))) {
+		char *ext = entry->d_name + strlen(entry->d_name) - 3;
+
+		if (!strcmp(ext, ".so")) {
+			void *handle;
+			char filename[1024];
+
+			snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name);
+			print_descr("   Loading plugin ", basename(filename));
+			handle = dlopen(filename, RTLD_LAZY);
+			if (!handle) {
+				_d("Failed loading plugin %s: %s", filename, dlerror());
+				print_result(1);
+				return 1;
+			}
+			print_result(0);
+		}
+	}
+
+	closedir(dp);
+	init_plugins();
+
+	return 0;
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugin.h

@@ -0,0 +1,121 @@
+/* Plugin based services architecture for finit
+ *
+ * Copyright (c) 2012  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_PLUGIN_H_
+#define FINIT_PLUGIN_H_
+
+#include <poll.h>
+#include <sys/queue.h>		/* BSD sys/queue.h API */
+
+#define PLUGIN_IO_READ  POLLIN
+#define PLUGIN_IO_WRITE POLLOUT
+
+#define PLUGIN_INIT(x) static void __attribute__ ((constructor)) x(void)
+#define PLUGIN_EXIT(x) static void __attribute__ ((destructor))  x(void)
+
+#define PLUGIN_ITERATOR(x)  LIST_FOREACH(x, &plugins, link)
+
+/*
+ * Predefined hook points for easier plugin debugging 
+ */
+typedef enum {
+	HOOK_BASEFS_UP = 0,
+	HOOK_NETWORK_UP,
+	HOOK_SYSTEM_UP,
+	HOOK_SHUTDOWN,
+	HOOK_MAX_NUM
+} hook_point_t;
+
+/**
+ * plugin_t - Finit &plugin_t object
+ * @link: BSD sys/queue.h linked list node
+ * @name: Plugin name, or identifier to match against a &svc_t object
+ * @svc:  Service callback for a loaded &svc_t object
+ * @hook: Hook callback definitions
+ * @io:   I/O hook callback
+ *
+ * To setup an &svc_t object callback for a service monitor the @name
+ * must match the @svc_t @cmd exactly for them to "pair".
+ *
+ * A &plugin_t object may contain a service callback, several hooks
+ * and/or an I/O callback as well. This way all critical extensions
+ * to finit can fit in one single plugin, if needed.
+ *
+ * The "dynamic events" discussed in the svc callback is for external
+ * service plugins to implement.  However, it can be anything that 
+ * can cause a service to need to SIGHUP at runtime.  E.g., acquiring
+ * a DHCP lease, or an interface going UP/DOWN.
+ *
+ * It is up to the external service plugin to track these events and
+ * relay them to each @dynamic service plugins' callback.  I.e., to
+ * all those with the dynamic flag set.
+ */
+typedef struct plugin {
+	/* BSD sys/queue.h linked list node. */
+	LIST_ENTRY(plugin) link;
+
+	/* Plugin name, defaults to plugin path if unset.
+	 * NOTE: Must be same as @cmd for service plugins! */
+	char *name;
+
+	/* Service callback to be called once per lap of runloop. */
+	struct plugin_svc {
+		/* Private */
+		int    id;       /* Service ID# to match this service plugin against, set on installation. */
+		/* Public */
+		void  *arg;	 /* Optional argument to callback func, set by plugin. */
+		int    dynamic;	 /* Reload (SIGHUP) on dynamic event?  Set by plugin. */
+		int    private;  /* For callbacks to use freely, possibly to store "states", set by plugin. */
+		int  (*cb)(void *arg, int event);
+	} svc;
+
+	/* List of hook callbacks. */
+	struct {
+		void  *arg;      /* Optional argument to callback func. */
+		void (*cb)(void *arg);
+	} hook[HOOK_MAX_NUM];
+
+	/* I/O Plugin */
+	struct {
+		int    fd, flags; /* 1:READ, 2:WRITE */
+		void  *arg;
+		void (*cb)(void *arg, int fd, int events);
+	} io;
+} plugin_t;
+
+/* Used by svc.h */
+typedef struct plugin_svc plugin_svc_t;
+
+/* Public plugin API */
+int plugin_register   (plugin_t *plugin);
+int plugin_unregister (plugin_t *plugin);
+
+#endif	/* FINIT_PLUGIN_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/Makefile

@@ -0,0 +1,35 @@
+# Plugin based services architecture for finit -*-Makefile-*-
+CFLAGS      = -fPIC -g -Os
+CPPFLAGS   += -I..
+LDFLAGS     = -shared 
+PLUGINS     = initctl.so alsa-utils.so bootmisc.so dbus.so hwclock.so \
+	      resolvconf.so urandom.so x11-common.so
+DEPS        = $(addprefix .,$(PLUGINS:.so=.d))
+
+include ../common.mk
+
+all: $(PLUGINS)
+
+clean:
+	-@$(RM) $(PLUGINS) *.o
+
+distclean: clean
+	-@$(RM) $(JUNK) $(DEPS)
+
+install: all
+	@install -d $(DESTDIR)$(prefix)$(PLUGIN_DIR)
+	@for plugin in $(PLUGINS); do \
+		echo "  INSTALL $(DESTDIR)$(prefix)$(PLUGIN_DIR)/$$plugin"; \
+		cp $$plugin $(DESTDIR)$(prefix)$(PLUGIN_DIR); \
+	done
+
+uninstall:
+	-@for plugin in $(PLUGINS); do \
+		echo "  RM      $(PLUGIN_DIR)/$$plugin"; \
+		rm $(DESTDIR)$(prefix)$(PLUGIN_DIR)/$$plugin 2>/dev/null; \
+	done
+	-@rmdir $(DESTDIR)$(prefix)$(PLUGIN_DIR) 2>/dev/null
+
+ifneq ($(MAKECMDGOALS),clean)
+ -include $(DEPS)
+endif

plugins/alsa-utils.c

@@ -0,0 +1,66 @@
+/* Save and restore ALSA sound settings using alsactl
+ *
+ * Copyright (c) 2012  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 "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void save(void *UNUSED(arg))
+{
+	_d("Saving system clock to RTC ...");
+	run_interactive("/usr/sbin/alsactl store > /dev/null 2>&1", "Saving sound settings");
+}
+
+static void restore(void *UNUSED(arg))
+{
+	_d("Restoring system clock from RTC ...");
+	run_interactive("/usr/sbin/alsactl restore > /dev/null 2>&1", "Restoring sound settings");
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_BASEFS_UP] = {
+		.cb  = restore
+	},
+	.hook[HOOK_SHUTDOWN] = {
+		.cb  = save
+	}
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/bootmisc.c

@@ -0,0 +1,85 @@
+/* Setup necessary files for UTMP, tracking logins
+ *
+ * Copyright (c) 2012  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 <string.h>
+#include <utmp.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void setup(void *UNUSED(arg))
+{
+#ifdef RUNLEVEL
+	struct utmp entry;
+#endif
+
+	_d("Setting up necessary UTMP files ...");
+	touch("/var/run/utmp");
+	chown("/var/run/utmp", 0, getgroup("utmp"));
+	chmod("/var/run/utmp", 0664);
+
+#ifdef RUNLEVEL
+	memset(&entry, 0, sizeof(struct utmp));
+	entry.ut_type = RUN_LVL;
+	entry.ut_pid = '0' + RUNLEVEL;
+	setutent();
+	pututline(&entry);
+	endutent();
+#endif
+
+#ifdef TOUCH_ETC_NETWORK_RUN_IFSTATE
+	touch("/etc/network/run/ifstate");
+#else
+	remove("/etc/network/run/ifstate");
+#endif
+
+	_d("Setting up misc files ...");
+	mkdir("/var/run/sshd", 01755); /* OpenSSH  */
+	mkfifo("/dev/xconsole", 0640); /* sysklogd */
+	chown("/dev/xconsole", 0, getgroup("tty"));
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_BASEFS_UP] = {
+		.cb  = setup
+	},
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/dbus.c

@@ -0,0 +1,62 @@
+/* Setup and start system message bus, D-Bus
+ *
+ * Copyright (c) 2012  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 "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void setup(void *UNUSED(arg))
+{
+#ifdef USE_MESSAGE_BUS
+	_d("Starting D-Bus ...");
+	mkdir("/var/run/dbus", 0755);
+	mkdir("/var/lock/subsys/messagebus", 0755);
+	run("dbus-uuidgen --ensure");
+	remove("/var/run/dbus/pid");
+	run_interactive("dbus-daemon --system", "Starting D-Bus");
+#endif
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_NETWORK_UP] = {
+		.cb  = setup
+	},
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/hwclock.c

@@ -0,0 +1,65 @@
+/* Save and restore RTC using hwclock
+ *
+ * Copyright (c) 2012  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 "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void save(void *UNUSED(arg))
+{
+	_d("Saving system clock to RTC ...");
+	run_interactive("/sbin/hwclock --systohc --utc", "Saving system time (UTC) to RTC");
+}
+
+static void restore(void *UNUSED(arg))
+{
+	_d("Restoring system clock from RTC ...");
+	run_interactive("/sbin/hwclock --hctosys --utc", "Restoring system clock (UTC) from RTC");
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_BASEFS_UP] = {
+		.cb  = restore
+	},
+	.hook[HOOK_SHUTDOWN] = {
+		.cb  = save
+	}
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/initctl.c

@@ -0,0 +1,120 @@
+/* Optional /dev/initctl FIFO monitor
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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 <string.h>
+
+#include "finit.h"
+#include "plugin.h"
+#include "signal.h"
+
+#define INIT_MAGIC		0x03091969
+#define INIT_CMD_RUNLVL		1
+
+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];
+};
+
+#ifdef LISTEN_INITCTL
+/* 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))
+{
+	struct init_request request;
+
+	_d("Receiving request on %s...", FINIT_FIFO);
+	while (1) {
+		ssize_t len = read(fd, &request, sizeof(request));
+
+		if (-1 == len) {
+			_d("Error %d", errno);
+			break;	/* Probably EAGAIN */
+		}
+
+		if (request.magic != INIT_MAGIC)
+			continue;
+
+		_d("Magic OK...");
+		if (request.cmd == INIT_CMD_RUNLVL) {
+			switch (request.runlevel) {
+			case '0':
+				_d("Halting system (SIGUSR2)");
+				do_shutdown(SIGUSR2);
+				break;
+
+			case '6':
+				_d("Rebooting system (SIGUSR1)");
+				do_shutdown(SIGUSR1);
+				break;
+
+			default:
+				_d("Unsupported runlevel: %d", request.runlevel);
+				break;
+			}
+		} else {
+			_d("Unsupported cmd: %d", request.cmd);
+		}
+	}
+}
+
+static plugin_t plugin = {
+	.io = {
+		.cb    = read_initctl,
+		.flags = PLUGIN_IO_READ,
+	},
+};
+
+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;
+	}
+
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+#endif  /* LISTEN_INITCTL */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/resolvconf.c

@@ -0,0 +1,89 @@
+/* Setup necessary files for resolvconf
+ *
+ * Copyright (c) 2012  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 "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void setup(void *UNUSED(arg))
+{
+#ifdef USE_ETC_RESOLVCONF_RUN
+	DIR *dir;
+	struct dirent *d;
+#endif
+
+	_d("Setting up the resolver ...");
+#ifdef USE_ETC_RESOLVCONF_RUN
+	makepath("/dev/shm/network");
+	makepath("/dev/shm/resolvconf/interface");
+
+	if ((dir = opendir("/etc/resolvconf/run/interface")) != NULL) {
+		while ((d = readdir(dir)) != NULL) {
+			if (isalnum(d->d_name[0]))
+				continue;
+			snprintf(line, sizeof(line),
+				 "/etc/resolvconf/run/interface/%s", d->d_name);
+			unlink(line);
+		}
+
+		closedir(dir);
+	}
+#endif
+
+#ifdef USE_VAR_RUN_RESOLVCONF
+	makepath("/var/run/resolvconf/interface");
+	symlink("../../../etc/resolv.conf", "/var/run/resolvconf/resolv.conf");
+#endif
+
+#ifdef USE_ETC_RESOLVCONF_RUN
+	touch("/etc/resolvconf/run/enable-updates");
+
+	chdir("/etc/resolvconf/run/interface");
+	run_parts("/etc/resolvconf/update.d", "-i", NULL);
+	chdir("/");
+#endif /* USE_ETC_RESOLVCONF_RUN */
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_BASEFS_UP] = {
+		.cb  = setup
+	},
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/urandom.c

@@ -0,0 +1,65 @@
+/* Setup random seed
+ *
+ * Copyright (c) 2012  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 <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void setup(void *UNUSED(arg))
+{
+#ifdef RANDOMSEED
+	copyfile(RANDOMSEED, "/dev/urandom", 0);
+	unlink(RANDOMSEED);
+	umask(077);
+	copyfile("/dev/urandom", RANDOMSEED, 4096);
+	umask(0);
+#endif
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_BASEFS_UP] = {
+		.cb  = setup
+	},
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

plugins/x11-common.c

@@ -0,0 +1,77 @@
+/* Console setup (for X)
+ *
+ * Copyright (c) 2012  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 <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+
+static void setup(void *UNUSED(arg))
+{
+#ifdef PAM_CONSOLE
+	int fd;
+#endif
+	char line[LINE_SIZE];
+
+	makepath("/var/run/console");
+	snprintf(line, sizeof(line), "/var/run/console/%s", username);
+	touch(line);
+
+#ifdef PAM_CONSOLE
+	if ((fd = open("/var/run/console/console.lock", O_CREAT|O_WRONLY|O_TRUNC, 0644)) >= 0) {
+		write(fd, username, strlen(username));
+		close(fd);
+		run("/sbin/pam_console_apply");
+	}
+#endif
+
+	mkdir("/tmp/.X11-unix", 01777);
+	mkdir("/tmp/.ICE-unix", 01777);
+}
+
+static plugin_t plugin = {
+	.hook[HOOK_NETWORK_UP] = {
+		.cb  = setup
+	},
+};
+
+PLUGIN_INIT(plugin_init)
+{
+	plugin_register(&plugin);
+}
+
+PLUGIN_EXIT(plugin_exit)
+{
+	plugin_unregister(&plugin);
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

private.h

@@ -0,0 +1,44 @@
+/* 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>
+ *
+ * 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_PRIVATE_H_
+#define FINIT_PRIVATE_H_
+
+#include "plugin.h"
+
+/* plugin.c */
+void run_hooks        (hook_point_t no);
+void run_services     (void);
+int  load_plugins     (char *path);
+void io_monitor       (void);
+
+#endif /* FINIT_PRIVATE_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

signal.c

@@ -0,0 +1,190 @@
+/* Signal management - Be conservative with what finit responds to!
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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.
+ *
+ * The standard SysV init only responds to the following signals:
+ *	 SIGHUP
+ *	      Has the same effect as telinit q.
+ *
+ *	 SIGUSR1
+ *	      On receipt of this signals, init closes and re-opens  its	 control
+ *	      fifo, /dev/initctl. Useful for bootscripts when /dev is remounted.
+ *
+ *	 SIGINT
+ *	      Normally the kernel sends this signal to init when CTRL-ALT-DEL is
+ *	      pressed. It activates the ctrlaltdel action.
+ *
+ *	 SIGWINCH
+ *	      The kernel sends this signal when the KeyboardSignal key	is  hit.
+ *	      It activates the kbrequest action.
+ */
+
+#include <signal.h>
+#include <sys/reboot.h>
+#include <sys/wait.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "plugin.h"
+#include "private.h"
+#include "signal.h"
+
+static int stopped = 0;
+
+
+void do_shutdown (int sig)
+{
+	touch(SYNC_SHUTDOWN);
+
+	if (sdown)
+		run_interactive(sdown, "Calling shutdown hook: %s", sdown);
+
+	_d("Sending SIGTERM to all processes.");
+	kill(-1, SIGTERM);
+
+	sleep(1);
+	/* Call all shutdown hooks, this is the last call before rebooting... */
+	run_hooks(HOOK_SHUTDOWN);
+
+	_d("Sending SIGKILL to remaining processes.");
+	kill(-1, SIGKILL);
+
+	sync();
+	sync();
+	_d("Unmounting file systems, remounting / read-only.");
+	run("/bin/umount -fa 2>/dev/null");
+	run("/bin/mount -n -o remount,ro / 2>/dev/null");
+	run("/sbin/swapoff -ea");
+
+	_d("%s.", sig == SIGINT || sig == SIGUSR1 ? "Rebooting" : "Halting");
+	if (sig == SIGINT || sig == SIGUSR1)
+		reboot(RB_AUTOBOOT);
+
+	reboot(RB_POWER_OFF);
+}
+
+/*
+ * Shut down on INT USR1 USR2
+ */
+static void shutdown_handler(int sig, siginfo_t *info, void *UNUSED(ctx))
+{
+	_d("Rebooting on signal %d from %s (PID %d)",
+	   sig, get_pidname(info->si_pid, NULL, 0), info->si_pid);
+
+	do_shutdown(sig);
+}
+
+/*
+ * SIGCHLD: one of our children has died
+ */
+static void chld_handler(int UNUSED(sig), siginfo_t *UNUSED(info), void *UNUSED(ctx))
+{
+	/* Do nothing, the svc_monitor() is the designated child reaper. */
+}
+
+/*
+ * SIGSTOP: Paused by user or netflash
+ */
+static void sigstop_handler(int sig, siginfo_t *info, void *UNUSED(ctx))
+{
+	_d("Received SIGSTOP(%d) from %s (PID %d)",
+	   sig, get_pidname(info->si_pid, NULL, 0), info->si_pid);
+	touch(SYNC_STOPPED);
+	stopped ++;
+}
+static void sigcont_handler(int sig, siginfo_t *info, void *UNUSED(ctx))
+{
+	_d("Received SIGCONT(%d) from %s (PID %d)",
+	   sig, get_pidname(info->si_pid, NULL, 0), info->si_pid);
+	stopped = 0;
+	remove(SYNC_STOPPED);
+}
+
+/*
+ * Is SIGSTOP asserted?
+ */
+int sig_stopped(void)
+{
+	return stopped;
+}
+
+/*
+ * Inital signal setup - ignore everything but SIGCHLD until we're capable of responding
+ */
+void sig_init(void)
+{
+	int i;
+	struct sigaction sa;
+
+	for (i = 1; i < NSIG; i++)
+		IGNSIG(sa, i, SA_RESTART);
+
+	SETSIG(sa, SIGCHLD, chld_handler, SA_RESTART);
+}
+
+/*
+ * Setup limited set of SysV compatible signals to respond to
+ */
+void sig_setup(void)
+{
+	struct sigaction sa;
+
+	_d("Setup signals");
+
+	/* Cleanup any stale finit control files */
+	remove(SYNC_SHUTDOWN);
+	remove(SYNC_STOPPED);
+
+	/* Standard SysV init calls ctrl-alt-delete handler */
+	SETSIG(sa, SIGINT,  shutdown_handler, 0);
+	SETSIG(sa, SIGPWR,  shutdown_handler, 0);
+
+	/* Ignore SIGUSR1/2 for now, only BusyBox init implements them as reboot+halt. */
+//	  SETSIG2(sa, SIGUSR1, reopen_initctl, 0);
+//	  SETSIG2(sa, SIGUSR2, pwrdwn_handler, 0);
+
+	/* Init must ignore SIGTERM. May otherwise get false SIGTERM in forked children! */
+	IGNSIG(sa, SIGTERM, 0);
+
+	/* Some C APIs may need SIGALRM for implementing timers. */
+	IGNSIG(sa, SIGALRM, 0);
+
+	/* We don't have any /etc/inittab yet, reread finit.conf? */
+	IGNSIG(sa, SIGHUP, 0);
+
+	/* Stopping init is a bit tricky. */
+	SETSIG(sa, SIGSTOP, sigstop_handler, 0);
+	SETSIG(sa, SIGTSTP, sigstop_handler, 0);
+	SETSIG(sa, SIGCONT, sigcont_handler, 0);
+
+	/* Disable CTRL-ALT-DELETE from kernel, we handle shutdown gracefully with SIGINT, above */
+	reboot(RB_DISABLE_CAD);
+	setsid();
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

signal.h

@@ -0,0 +1,70 @@
+/* Signal management - Be conservative with what finit responds to!
+ *
+ * Copyright (c) 2008-2010  Claudio Matsuoka <cmatsuoka@gmail.com>
+ * Copyright (c) 2008-2012  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_SIGNAL_H_
+#define FINIT_SIGNAL_H_
+
+#include_next <signal.h>
+
+#define SYNC_SHUTDOWN   "/var/lock/finit.shutdown"
+#define SYNC_STOPPED    "/var/lock/finit.stopped"
+
+#define SETSIG(sa, sig, fun, flags)			\
+	do {						\
+		sa.sa_sigaction = fun;			\
+		sa.sa_flags = SA_SIGINFO | flags;	\
+		sigemptyset(&sa.sa_mask);		\
+		sigaction(sig, &sa, NULL);		\
+	} while (0)
+
+#define IGNSIG(sa, sig, flags)			\
+	do {					\
+		sa.sa_handler = SIG_IGN;	\
+		sa.sa_flags = flags;		\
+		sigemptyset(&sa.sa_mask);	\
+		sigaction(sig, &sa, NULL);	\
+	} while (0)
+
+#define DFLSIG(sa, sig, flags)                  \
+        do {                                    \
+                sa.sa_handler = SIG_DFL;        \
+                sa.sa_flags = flags;            \
+                sigemptyset(&sa.sa_mask);       \
+                sigaction(sig, &sa, NULL);      \
+        } while (0)
+
+void do_shutdown    (int sig);
+int  sig_stopped    (void);
+void sig_init       (void);
+void sig_setup      (void);
+
+#endif /* FINIT_SIGNAL_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

strlcpy.c

@@ -0,0 +1,58 @@
+/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert 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>
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+
+	/* Copy as many bytes as will fit */
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src */
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';		/* NUL-terminate dst */
+		while (*s++)
+			;
+	}
+
+	return(s - src - 1);	/* count does not include NUL */
+}
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  c-file-style: "bsd"
+ * End:
+ */

svc.c

@@ -0,0 +1,414 @@
+/* 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>
+ *
+ * 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 <string.h>
+#include <sys/wait.h>
+
+#include "finit.h"
+#include "helpers.h"
+#include "private.h"
+#include "signal.h"
+#include "svc.h"
+
+/* The registered services are kept in shared memory for easy read-only access
+ * by 3rd party APIs.  Mostly because of the ability to, from the outside, query
+ * liveness state of all daemons that should run. */
+static int svc_counter = 0;		/* Number of registered services to monitor. */
+static svc_t *services = NULL;          /* List of registered services, in shared memory. */
+
+
+/* Connect to/create shared memory area of registered servies */
+static void __connect_shm(void)
+{
+	if (!services) {
+		services = finit_svc_connect();
+		if (!services) {
+			/* This should never happen, but if it does we're probably
+			 * knee-deep in more serious problems already... */
+			_e("Failed setting up shared memory for service monitor.\n");
+			abort();
+		}
+	}
+}
+
+/**
+ * svc_new - Create a new service object
+ *
+ * Returns:
+ * A pointer to an empty &svc_t object, or %NULL if out of empty slots.
+ */
+svc_t *svc_new(void)
+{
+	svc_t *svc = NULL;
+
+	__connect_shm();
+	if (svc_counter < MAX_NUM_SVC) {
+		svc = &services[svc_counter];
+		memset(svc, 0, sizeof(*svc));
+		svc->id = svc_counter++;
+	} else {
+		errno = ENOMEM;
+		return NULL;
+	}
+
+	return svc;
+}
+
+/**
+ * svc_find_by_id - Find a service object by its logical ID#
+ * @id: Logical ID#
+ *
+ * Returns:
+ * A pointer to an &svc_t object, or %NULL if not found.
+ */
+svc_t *svc_find_by_id(int id)
+{
+	__connect_shm();
+	if (id >= svc_counter)
+		return NULL;
+
+	return &services[id];
+}
+
+/**
+ * svc_find_by_name - Find a service object by its full path name
+ * @name: Full path name, e.g., /sbin/syslogd
+ *
+ * Returns:
+ * A pointer to an &svc_t object, or %NULL if not found.
+ */
+svc_t *svc_find_by_name(char *name)
+{
+	int i;
+
+	__connect_shm();
+	for (i = 0; i < svc_counter; i++) {
+		svc_t *svc = &services[i];
+
+		if (!strncmp(name, svc->cmd, strlen(svc->cmd))) {
+			_d("Found a matching svc for %s", name);
+			return svc;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * svc_iterator - Iterates over all registered services.
+ * @restart: Get first &svc_t object by setting @restart
+ *
+ * Returns:
+ * The first &svc_t when @restart is set, otherwise the next &svc_t until
+ * the end when %NULL is returned.
+ */
+svc_t *svc_iterator(int restart)
+{
+	static int id = 0;
+
+	__connect_shm();
+	if (restart)
+		id = 0;
+
+	if (id >= svc_counter)
+		return NULL;
+
+	return &services[id++];
+}
+
+/**
+ * svc_register - Register a non-backgrounding service to be monitored
+ * @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:
+ *
+ *   "service [@username] /path/to/daemon -- Description text"
+ *
+ * The [] brackets means the argument is optional. If the username is
+ * left out the daemon is started as root.
+ *
+ * Returns:
+ * POSIX OK(0) on success, or non-zero errno exit status on failure.
+ */
+int svc_register(char *line, char *username)
+{
+	int i = 0;
+	char *cmd, *descr;
+	svc_t *svc;
+
+	if (!line) {
+		_e("Invalid input argument.");
+		return errno = EINVAL;
+	}
+
+	descr = strstr(line, "-- ");
+	if (descr)
+		*descr = 0;
+
+	cmd = strtok(line, " ");
+	if (!cmd) {
+	incomplete:
+		_e("Incomplete service, cannot register.");
+		return errno = ENOENT;
+	}
+
+	if (cmd[0] == '@') {	/* @username */
+		username = &cmd[1];
+
+		/* Check if valid command follows... */
+		cmd = strtok(NULL, " ");
+		if (!cmd)
+			goto incomplete;
+	}
+
+	svc = svc_new();
+	if (!svc) {
+		_e("Out of memorym, cannot register service %s", cmd);
+		return errno = ENOMEM;
+	}
+
+	if (descr)
+		strlcpy(svc->descr, descr + 3, sizeof(svc->descr));
+	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]));
+
+	while ((cmd = strtok(NULL, " ")))
+		strlcpy(svc->args[i++], cmd, sizeof(svc->args[0]));
+	svc->args[i][0] = 0;
+
+	return 0;
+}
+
+
+/**
+ * svc_enabled - Should the service run?
+ * @svc: Pointer to &svc_t object
+ * @dynamic: Dynamic event, opaque flag passed to callback
+ *
+ * This method calls an associated service callback, if registered by a
+ * plugin, and returns the &svc_cmd_t status. If no plugin is registered
+ * the service is statically enabled in /etc/finit.conf and the result
+ * will always be %SVC_START.
+ *
+ * Returns:
+ * Either one of %SVC_START, %SVC_STOP, %SVC_RELOAD.
+ */
+svc_cmd_t svc_enabled(svc_t *svc, int dynamic)
+{
+	if (!svc) {
+		errno = EINVAL;
+		return SVC_STOP;
+	}
+
+	if (!svc->plugin) {
+		/* Unknown service, default to enabled. */
+		return SVC_START;
+	}
+
+	return svc->plugin->cb(svc, dynamic);
+}
+
+static int is_norespawn(void)
+{
+	return  sig_stopped()            ||
+		fexist("/mnt/norespawn") ||
+		fexist("/tmp/norespawn");
+}
+
+void svc_monitor(void)
+{
+	pid_t lost;
+	svc_t *svc;
+
+	lost = waitpid(-1, NULL, WNOHANG);
+	if (lost < 1)
+		return;
+
+	if (fexist(SYNC_SHUTDOWN) || lost <= 1)
+		return;
+
+	/* Power user at the console, don't respawn tasks. */
+	if (is_norespawn())
+		return;
+
+	for (svc = svc_iterator(1); svc; svc = svc_iterator(0)) {
+		char *name = basename(svc->cmd);
+
+		if (lost != svc->pid)
+			continue;
+
+		_d("Ouch, lost pid %d - %s(%d)", lost, name, svc->pid);
+		if (sig_stopped()) {
+			_e("Stopped, not respawning killed processes.");
+			break;
+		}
+
+		/* Cleanup any lingering or semi-restarting tasks before respawning */
+		_d("Sending SIGTERM to service group %s", name);
+		kill_procname(name, SIGTERM);
+
+		/* Restarting lost service. */
+		if (svc_enabled(svc, 0))
+			svc_start(svc);
+
+		break;
+	}
+}
+
+int svc_start(svc_t *svc)
+{
+	int respawn = svc->pid != 0;
+	pid_t pid;
+	char *args[MAX_NUM_SVC_ARGS];
+
+	/* Ignore if finit is SIGSTOP'ed */
+	if (is_norespawn())
+		return 0;
+
+	if (!respawn)
+		print_descr("Starting ", svc->descr);
+
+	pid = fork();
+	if (pid == 0) {
+		int i = 0;
+		int uid = getuser(svc->username);
+		struct sigaction sa;
+
+		/* Reset signal handlers that were set by the parent process */
+                for (i = 1; i < NSIG; i++)
+			DFLSIG(sa, i, 0);
+
+		/* Set desired user */
+		if (uid >= 0)
+			setuid(uid);
+
+		/* Serve copy of args to process in case it modifies them. */
+		for (i = 0; svc->args[i][0] != 0 && i < MAX_NUM_SVC_ARGS; i++)
+			args[i] = svc->args[i];
+		args[i] = NULL;
+
+		if (debug) {
+			int fd = open (CONSOLE, O_WRONLY | O_APPEND);
+			if (-1 != fd) {
+				dup2(STDOUT_FILENO, fd);
+				dup2(STDERR_FILENO, fd);
+			}
+
+			_e("%starting %s ", respawn ? "Res" : "S", svc->cmd);
+			for (i = 0; args[i] && i < MAX_NUM_SVC_ARGS; i++)
+				_e("%s ", args[i]);
+			_e("");
+		}
+
+		execvp(svc->cmd, args);
+		exit(0);
+	}
+	svc->pid = pid;
+
+	if (!respawn)
+		print_result(svc->pid > 1 ? 0 : 1);
+
+	return 0;
+}
+
+int svc_start_by_name(char *name)
+{
+	svc_t *svc = svc_find_by_name(name);
+
+	if (svc && svc_enabled(svc, 0))
+		return svc_start(svc);
+
+	return 1;
+}
+
+int svc_stop(svc_t *svc)
+{
+	int res = 1;
+
+	if (!svc) {
+		_e("Failed, no svc pointer.");
+		return 1;
+	}
+
+	if (svc->pid <= 1) {
+		_d("Bad PID %d for %s, SIGTERM", svc->pid, svc->descr);
+		svc->pid = 0;
+		return 1;
+	}
+
+	print_descr("Stopping ", svc->descr);
+	_d("Sending SIGTERM to pid:%d name:'%s'", svc->pid, get_pidname(svc->pid, NULL, 0));
+	res = kill(svc->pid, SIGTERM);
+	print_result(res);
+	svc->pid = 0;
+
+	return res;
+}
+
+int svc_reload(svc_t *svc)
+{
+	if (!svc) {
+		_e("Failed, no svc pointer.");
+		return 1;
+	}
+
+	if (svc->pid <= 1) {
+		_d("Bad PID %d for %s, SIGHUP", svc->pid, svc->cmd);
+		svc->pid = 0;
+		return 1;
+	}
+
+	_d("Sending SIGHUP to PID %d", svc->pid);
+	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);
+		if (cmd == SVC_START || (cmd == SVC_RELOAD && svc->pid == 0))
+			svc_start(svc);
+		else if (cmd == SVC_RELOAD)
+			svc_reload(svc);
+	}
+
+	/* XXX: Hook point for plugins. */
+}
+
+
+/**
+ * Local Variables:
+ *  compile-command: "gcc -g -DUNITTEST -o unittest svc.c"
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */

svc.h

@@ -0,0 +1,118 @@
+/* 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>
+ *
+ * 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_SVC_H_
+#define FINIT_SVC_H_
+
+#include <errno.h>
+#include <string.h>		/* strerror() */
+#include <sys/shm.h>		/* shmat() */
+#include <sys/types.h>		/* pid_t */
+
+#include "finit.h"
+#include "plugin.h"
+
+typedef enum {
+	SVC_STOP = 0,		/* Disabled */
+	SVC_START,		/* Enabled */
+	SVC_RELOAD		/* Enabled, needs restart */
+} svc_cmd_t;
+
+#define FINIT_SHM_ID     0x494E4954  /* "INIT", see ascii(7) */
+#define MAX_ARG_LEN      64
+#define MAX_STR_LEN      64
+#define MAX_USER_LEN     16
+#define MAX_NUM_FDS      64	     /* Max number of I/O plugins */
+#define MAX_NUM_SVC      64	     /* Enough? */
+#define MAX_NUM_SVC_ARGS 16
+
+/* Default enable for all services, can be stopped by means
+ * of issuing an initctl call. E.g.
+ *   initctl <stop|start|restart> service */
+typedef struct svc {
+	/* Private */
+	int            id;	/* Service ID#, set by svc_new() */
+	pid_t	       pid;
+	char	       cmd[MAX_ARG_LEN];
+	char	       args[MAX_NUM_SVC_ARGS][MAX_ARG_LEN];
+	char	       descr[MAX_STR_LEN];
+	char           username[MAX_USER_LEN];
+	/* Public */
+	int	       delayed_reload; /* For external service plugin. */
+	plugin_svc_t  *plugin;
+} svc_t;
+
+typedef struct svc_map svc_map_t;
+
+/* Put services array in shm */
+static inline svc_t *finit_svc_connect(void)
+{
+	const long ID = FINIT_SHM_ID;
+	static void *ptr = (void *)-1;
+
+	if ((void *)-1 == ptr) {
+		ptr = shmat (shmget (ID, sizeof(svc_t) * MAX_NUM_SVC, 0600 | IPC_CREAT), NULL, 0);
+		if ((void *)-1 == ptr) {
+			_d("Failed allocating shared memory, error %d: %s", errno, strerror (errno));
+			return NULL;
+		}
+	}
+
+	return (svc_t *)ptr;
+}
+
+static inline int svc_id(svc_t *svc)
+{
+	if (!svc) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	return svc->id;
+}
+
+svc_t    *svc_new           (void);
+svc_t    *svc_find_by_id    (int id);
+svc_t    *svc_find_by_name  (char *name);
+svc_t    *svc_iterator      (int restart);
+
+int       svc_register      (char *line, char *username);
+int       svc_id_by_name    (char *name);
+svc_cmd_t svc_enabled	    (svc_t *svc, int dynamic);
+int       svc_start         (svc_t *svc);
+int       svc_start_by_name (char *name);
+int       svc_stop          (svc_t *svc);
+int       svc_reload        (svc_t *svc);
+void      svc_start_all     (void);
+void      svc_monitor       (void);
+
+#endif	/* FINIT_SVC_H_ */
+
+/**
+ * Local Variables:
+ *  version-control: t
+ *  indent-tabs-mode: t
+ *  c-file-style: "linux"
+ * End:
+ */