9 Commits

Author SHA1 Message Date
Eric Vidal
244c0a4203 change path for stage2, stage3 2016-06-04 09:36:00 +04:00
Eric Vidal
fa04d943a6 rebuild database 2016-06-03 22:10:36 +04:00
Eric Vidal
1758a4fe48 fix dependencies for rofs-hardclock 2016-06-03 22:10:02 +04:00
Eric Vidal
22bfa5e1a5 build again default database to follow the change 2016-06-02 18:21:07 +04:00
Eric Vidal
49d7bc3436 bring up after udevd 2016-06-02 18:20:36 +04:00
Eric Vidal
615bfc18a4 always exit with success to avoids crash if a check is made 2016-06-02 18:19:44 +04:00
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
33 changed files with 57 additions and 15 deletions

1
compiled/current Symbolic link
View File

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

BIN
compiled/default/db Normal file

Binary file not shown.

0
compiled/default/lock Normal file
View File

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

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

View File

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

3
init
View File

@@ -58,7 +58,6 @@ if {
import -i svc-serv import -i svc-serv
foreground { foreground {
if { cp -a ${svc-serv} /run/s6 } if { cp -a ${svc-serv} /run/s6 }
cp -a /etc/s6/.rc-serv /run/
} }
# Create symlink to /run/s6-run # Create symlink to /run/s6-run
@@ -80,7 +79,7 @@ background {
s6-setsid -- s6-setsid --
redirfd -w 1 /run/s6-run/service/s6-svscan-log/fifo redirfd -w 1 /run/s6-run/service/s6-svscan-log/fifo
fdmove -c 2 1 fdmove -c 2 1
/etc/stage2 /etc/s6/stage2
} }
unexport ! unexport !

View File

@@ -1,3 +1,8 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
fdmove -c 2 1 fdmove -c 2 1
fsck -A -T -a # if partition is checked, fsck return a fail exit
# and a crash occurs, so whatever happens with fsck, the output need to be a success
if -t {
fsck -A -T -a
}
s6-true

View File

@@ -1 +1 @@
00

View File

@@ -1 +1,2 @@
00 00
rofs-Udevd

View File

@@ -1 +0,0 @@
udevd-pipe

View File

@@ -1 +0,0 @@
udevd-udevdlog

View File

@@ -1 +0,0 @@
udevadm-pipe

View File

@@ -1 +0,0 @@
udevd-udevadmlog

2
stage2
View File

@@ -18,7 +18,7 @@ if -nt {
if { s6-echo -- "** Start Stage 2 **" } if { s6-echo -- "** Start Stage 2 **" }
if { s6-echo -- "***************************************************************************" } if { s6-echo -- "***************************************************************************" }
# start service # start service
if { s6-rc-init -c /run/.rc-serv /run/s6-run/service } if { s6-rc-init -c /etc/s6/compiled/current /run/s6-run/service }
if { s6-rc -u change All } if { s6-rc -u change All }
if { s6-echo -- "***************************************************************************" } if { s6-echo -- "***************************************************************************" }
if { s6-echo -- "** Stage 2 completed **" } if { s6-echo -- "** Stage 2 completed **" }

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
foreground { /etc/stage2.tini } foreground { /etc/s6/stage2.tini }
s6-svscanctl -h -- /run/s6-run/service s6-svscanctl -h -- /run/s6-run/service

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
foreground { /etc/stage2.tini } foreground { /etc/s6/stage2.tini }
s6-svscanctl -6 -- /run/s6-run/service s6-svscanctl -6 -- /run/s6-run/service

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
foreground { /etc/stage2.tini } foreground { /etc/s6/stage2.tini }
s6-svscanctl -q -- /run/s6-run/service s6-svscanctl -q -- /run/s6-run/service

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
foreground { /etc/stage2.tini } foreground { /etc/s6/stage2.tini }
s6-svscanctl -t -- /run/s6-run/service s6-svscanctl -t -- /run/s6-run/service

View File

@@ -1,4 +1,4 @@
#!/usr/local/bin/execlineb -P #!/usr/local/bin/execlineb -P
foreground { /etc/stage2.tini } foreground { /etc/s6/stage2.tini }
s6-svscanctl -7 -- /run/s6-run/service s6-svscanctl -7 -- /run/s6-run/service

View File

@@ -6,4 +6,4 @@ fdmove -c 1 2
foreground { s6-svc -X -- /run/s6-run/service/s6-svscan-log } foreground { s6-svc -X -- /run/s6-run/service/s6-svscan-log }
unexport ? unexport ?
wait -r -- { } wait -r -- { }
/etc/stage3 ${@} /etc/s6/stage3 ${@}