16 Commits

Author SHA1 Message Date
Eric Vidal
0895fd81ac remove pipe for log entry on udevd udevadm 2016-05-31 20:15:47 +04:00
Eric Vidal
c56a5527ea provide a default database 2016-05-31 17:38:22 +04:00
Eric Vidal
fad5c2878f change place of compiled database for s6-rc, using current as symlink allow to change database on running time without changing the init and stage2 script 2016-05-31 17:37:56 +04:00
Eric Vidal
7c08fd3298 add directory for user service 2016-05-26 21:09:03 +04:00
Eric Vidal
d8ded07d97 rename boot service directory 2016-05-26 21:08:38 +04:00
Eric Vidal
14255da33d change origin of database 2016-05-26 21:05:35 +04:00
Eric Vidal
227e9634e4 oops 2016-05-25 13:16:18 +04:00
Eric Vidal
bd944a7194 improve s6-svc zsh completion 2016-05-25 13:15:09 +04:00
Eric Vidal
a70d048192 improve completion for s6-svc 2016-05-24 21:38:50 +04:00
Eric Vidal
33e7d5b330 fix bug about supervision control 2016-05-23 20:10:50 +04:00
Eric Vidal
5134fa1da5 oops 2016-05-23 13:12:54 +04:00
Eric Vidal
2d95062402 add zsh completion for s6-svc 2016-05-23 13:10:28 +04:00
Eric Vidal
502e66ab40 add log for divers service 2016-05-19 18:42:36 +04:00
Eric Vidal
f0d29a96d4 change command for divers Signal 2016-05-19 18:39:17 +04:00
Eric Vidal
465df8bf18 load environment for svscan 2016-05-19 18:38:21 +04:00
Eric Vidal
d13bf1f770 call SIGUSR2 instead of SIGUSR1 2016-05-19 18:37:21 +04:00
116 changed files with 166 additions and 28 deletions

113
_s6-svc Normal file
View File

@@ -0,0 +1,113 @@
#compdef s6-svc
# completion for s6-svc
# Eric Vidal <eric@obarun.org>
# services in /run/s6/service. Change the path variable to suit your needs.
path_dir=/run/s6/service
typeset -A opt_args
_path() {
local list_dir
list_dir=( $path_dir/* )
compadd "$@" -a list_dir
}
_list_common=(
'-a[send a SIGALRM to the supervised process]'
'-b[send a SIGABRT to the supervised process]'
'-q[send a SIGQUIT to the supervised process]'
'-h[send a SIGHUP to the supervised process]'
'-k[send a SIGKILL to the supervised process]'
'-t[send a SIGTERM to the supervised process]'
'-i[send a SIGINT to the supervised process]'
'-1[send a SIGUSR1 to the supervised process]'
'-2[send a SIGUSR2 to the supervised process]'
'-p[send a SIGSTOP to the supervised process]'
'-c[send a SIGCONT to the supervised process]'
'-y[send a SIGWINCH to the supervised process]'
'-o[once. Equivalent to -uO]'
'-d[down]'
'-u[up]'
'-x[exit]'
'-X[close fds and exit]'
'-O[Once at most. Do not restart when it dies]'
'-T[timeout]'
)
_list_special=(
'-wd[s6-svc will not exit until the service is down]'
'-wD[s6-svc will not exit until the service is down and ready to be brought up]'
'-wu[s6-svc will not exit until the service is up]'
'-wU[s6-svc will not exit until the service is up and ready]'
'-wr[s6-svc will not exit until the service has been started or restarted]'
'-wR[same as -wr but need to be notified readiness]'
)
_svc_action_none() {
_arguments \
"$_list_common[@]" \
"$_list_special[@]"
}
_svc() {
local context line i
typeset -A opt_args
case $words[CURRENT] in
*wd*|*wD*|*wu*|*wU*|*wr*|*wR*)
_arguments -s : \
"$_list_common[@]" \
"$_list_special[@]" \
'*:service:_path'
;;
*a*|*b*|*q*|*h*|*k*|*t*|*i*|*1*|*2*|*p*|*c*|*y*|*o*|*d*|*u*|*x*|*X*|*O*)
if [[ $words[CURRENT] == -*T ]]; then
_arguments : \
':\if the -wstate option has been given, -T specifies a timeout in milliseconds: ' \
'*:service:_path'
else
_arguments -s : \
"$_list_common[@]" \
"$_list_special[@]" \
'*:service:_path'
fi
;;
-T)
_arguments -s : \
':if the -wstate option has been given, -T specifies a timeout in milliseconds: ' \
'*:service:_path'
;;
*) i=$#;
while [[ $words[$i] != "s6-svc" ]];do
if [[ $words[$i] == -* ]]; then
break
else
i=$(($i-1))
fi
done
case $i in
-*)
if [[ $words[$i] != "s6-svc" ]]; then
_arguments -s : \
"$_list_common[@]" \
"$_list_special[@]" \
'*:service:_path'
else
_message "enter a - character to begin the completion"
fi
;;
*)
_svc_action_none
;;
esac
;;
esac
}
_svc "$@"

1
compiled/current Symbolic link
View File

@@ -0,0 +1 @@
/etc/s6/compiled/default

BIN
compiled/default/db Normal file

Binary file not shown.

BIN
compiled/default/n Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1 @@
S6_FDHOLDER_STORE_REGEX

View File

@@ -0,0 +1 @@
^pipe:s6rc-

View File

@@ -0,0 +1 @@
1

View File

@@ -0,0 +1,16 @@
#!/usr/local/bin/execlineb -P
pipeline -dw --
{
if -n --
{
forstdin -x 1 -- i
exit 1
}
if -nt --
{
s6-ipcclient -l0 -- s
/usr/libexec/s6-rc-fdholder-filler -1 --
}
s6-svc -t .
}
s6-fdholder-daemon -1 -i data/rules -- s

View File

@@ -0,0 +1 @@
3

View File

@@ -0,0 +1,8 @@
#!/usr/local/bin/execlineb -P
fdmove -c 2 1
fdmove 1 3
s6-ipcserver-socketbinder -- s
s6-ipcserverd -1 --
s6-ipcserver-access -v0 -E -l0 -i data/rules --
s6-sudod -t 2000 --
/usr/libexec/s6-rc-oneshot-run -l ../.. --

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P
fdmove -c 2 1
#fdmove -c 2 1
s6-devd
/usr/bin/udevadm settle

2
init
View File

@@ -58,7 +58,6 @@ if {
import -i svc-serv
foreground {
if { cp -a ${svc-serv} /run/s6 }
cp -a /etc/s6/rc-serv /run/.rc-serv
}
# Create symlink to /run/s6-run
@@ -85,4 +84,5 @@ background {
unexport !
fdmove -c 2 1
s6-envdir -I /run/s6-run/service/.s6-svscan/
s6-svscan -st0 /run/s6-run/service

View File

@@ -1,3 +1,3 @@
#!/bin/bash
exec /run/s6-run/service/.s6-svscan/SIGUSR1
exec /run/s6-run/service/.s6-svscan/SIGUSR2

View File

@@ -0,0 +1 @@

View File

@@ -1,3 +1,5 @@
#!/usr/local/bin/execlineb -P
fdmove -c 2 1
dhcpcd -B
exec -c
udevd

View File

@@ -0,0 +1,4 @@
#!/usr/local/bin/execlineb -P
#fdmove -c 2 1
s6-devd
/usr/bin/udevadm settle

View File

View File

@@ -1,4 +0,0 @@
user-dbus
#user-dbuslog
user-dhcpcd
#user-dhcpcdlog

View File

@@ -1,3 +0,0 @@
#!/usr/local/bin/execlineb -P
/usr/bin/rm -rf /run/dbus/

Some files were not shown because too many files have changed in this diff Show More