wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-06 15:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup and corrections for new terminology

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2016-07-15 15:51:57 +02:00
1 parent eb57457522
commit 2b74fb0e93
2 files changed
+8 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

TODO.md
-4
View File
@@ -22,10 +22,6 @@ General
* Add `!` or `[wait <pidfile>]` to service directive to let finit pause * Add `!` or `[wait <pidfile>]` to service directive to let finit pause
and wait for a pidfile before starting processes -- both at boot and and wait for a pidfile before starting processes -- both at boot and
when starting processes in a runlevel. when starting processes in a runlevel.
* Allow custom reload for processes like libreSwan's pluto
service [2345] <!gw,if:eth0,reload:'starter reload'> /sbin/pluto
* Allow process callbacks to be scripts. * Allow process callbacks to be scripts.
* Add support for a pipe/popen where we can listen for `STOP`, `START` * Add support for a pipe/popen where we can listen for `STOP`, `START`
and `RELOAD` on `STDOUT` from a script ... call it for example and `RELOAD` on `STDOUT` from a script ... call it for example
service.c
+8 -9
View File
@@ -420,10 +420,10 @@ void service_runlevel(int newlevel)
* The @line can optionally start with a username, denoted by an @ * The @line can optionally start with a username, denoted by an @
* character. Like this: * character. Like this:
* *
* service @username [!0-6,S] <!EV> /path/to/daemon arg -- Description * service @username [!0-6,S] <!COND> /path/to/daemon arg -- Description
* task @username [!0-6,S] /path/to/task arg -- Description * task @username [!0-6,S] /path/to/task arg -- Description
* run @username [!0-6,S] /path/to/cmd arg -- Description * run @username [!0-6,S] /path/to/cmd arg -- Description
* inetd tcp/ssh nowait [2345] @root:root /sbin/sshd -i -- Description * inetd tcp/ssh nowait [2345] @root:root /sbin/sshd -i -- Description
* *
* If the username is left out the command is started as root. The [] * If the username is left out the command is started as root. The []
* brackets denote the allowed runlevels, if left out the default for a * brackets denote the allowed runlevels, if left out the default for a
@@ -440,10 +440,9 @@ void service_runlevel(int newlevel)
* special case when a service is declared with <!> means it does not * special case when a service is declared with <!> means it does not
* support SIGHUP but must be STOP/START'ed at system reconfiguration. * support SIGHUP but must be STOP/START'ed at system reconfiguration.
* *
* Supported service events are: GW, IFUP[:ifname], IFDN[:ifname], where * Service conditions can be: svc/<PATH> for PID files, net/<IFNAME>/up
* the interface name (:ifname) is optional. Actully, the check with a * and net/<IFNAME>/exists. The condition handling is further described
* service event declaration is string based, so 'IFUP:ppp' will match * doc/conditions.md.
* any of "IFUP:ppp0" or "IFUP:pppoe1" sent by the netlink.so plugin.
* *
* For multiple instances of the same command, e.g. multiple DHCP * For multiple instances of the same command, e.g. multiple DHCP
* clients, the user must enter an ID, using the :ID syntax. * clients, the user must enter an ID, using the :ID syntax.
@@ -491,7 +490,7 @@ int service_register(int type, char *line, time_t mtime, char *username)
username = &cmd[1]; username = &cmd[1];
else if (cmd[0] == '[') /* [runlevels] */ else if (cmd[0] == '[') /* [runlevels] */
runlevels = &cmd[0]; runlevels = &cmd[0];
else if (cmd[0] == '<') /* <[!][ev][,ev..]> */ else if (cmd[0] == '<') /* <[!][cond][,cond..]> */
cond = &cmd[1]; cond = &cmd[1];
else if (cmd[0] == ':') /* :ID */ else if (cmd[0] == ':') /* :ID */
id = atoi(&cmd[1]); id = atoi(&cmd[1]);