12 Commits
luks ... v0.2.0

Author SHA1 Message Date
obarun
fea3b2675c Bump 0.2.0 2018-01-04 15:50:31 +11:00
obarun
2dfb3ac0ad rebuild database 2018-01-04 15:36:08 +11:00
obarun
fb924ced4f merge branch dev 2018-01-04 15:34:28 +11:00
obarun
7008745393 rebuild database 2018-01-04 15:26:26 +11:00
obarun
5a93f2ca81 fix output message of iptables6 at shutdown 2018-01-04 15:23:08 +11:00
obarun
3cd9f46117 umount nfs if exist 2018-01-04 15:19:10 +11:00
obarun
f88b0f4eac rebuild database 2018-01-04 15:03:28 +11:00
obarun
1c6c1ff259 improve udevd and udevadm service 2018-01-04 15:01:57 +11:00
obarun
f5217e18ef oops wrong variable 2017-12-13 15:34:02 +11:00
obarun
051dacc843 bump 0.1.9 2017-12-13 15:12:05 +11:00
obarun
d3ec2f001e rebuild database 2017-12-13 15:11:32 +11:00
obarun
0594295927 fix svscanctl command 2017-12-13 15:01:34 +11:00
15 changed files with 26 additions and 42 deletions

12
NEWS
View File

@@ -1,5 +1,17 @@
Changelog for s6-boot Changelog for s6-boot
In 0.2.0
--------
- Bugs fix
- Improve udevd and udevadm service
- Umount NFS4 system if exist on stage2.tini
In 0.1.9
--------
- Bugs fix
In 0.1.8 In 0.1.8
-------- --------

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,14 +0,0 @@
#!/usr/local/bin/execlineb -P
# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution and at https://github.com/Obarun/s6-boot/LICENSE
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
fdmove -c 2 1
if { s6-echo -- udevd-udevadm started }
s6-devd
/usr/bin/udevadm settle

View File

@@ -188,7 +188,7 @@ enabled_daemon() {
} }
start_database() { start_database() {
log "init s6-rc database" log "init s6-rc database with -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}"
if [[ "${_UID}" == 0 ]]; then if [[ "${_UID}" == 0 ]]; then
s6-rc-init -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH} s6-rc-init -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -c ${RC_DATABASE_COMPILED}/current ${LIVE_CLASSIC_PATH}
s6-rc -v 3 -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -u change All s6-rc -v 3 -l ${LIVE_RC_PATH}/${LIVE_RC_NAME} -u change All
@@ -223,7 +223,7 @@ add() {
enabled_daemon || exit 1 enabled_daemon || exit 1
s6_cmd "svscanctl" "an" "${DESTUSER}/${USER}/${DESTCLASSIC}" 2>/dev/null || exit 1 s6_cmd "svscanctl" "an" "${LIVE_CLASSIC_PATH}" 2>/dev/null || exit 1
start_database || exit 1 start_database || exit 1
} }

View File

@@ -1,3 +1,3 @@
udevd-udev udevd-udev
udevd-udevrules
udevd-udevadm udevd-udevadm

View File

@@ -16,6 +16,7 @@ importas -D "" IP6TABLES IP6TABLES
ifelse -X { s6-test $IP6TABLES = yes } ifelse -X { s6-test $IP6TABLES = yes }
{ {
if { s6-echo -- Flushing ip6tables } if { s6-echo -- Flushing ip6tables }
/usr/lib/iptables/scripts/iptables-flush 6 foreground { /usr/lib/iptables/scripts/iptables-flush 6 }
}
s6-echo -- Ip6tables flushed s6-echo -- Ip6tables flushed
}
s6-echo -- Ip6tables not actived

View File

@@ -1,2 +1,2 @@
udevd-udev udevd-udev
udevd-udevrules

View File

@@ -1,14 +0,0 @@
#!@BINDIR_EXECLINE@/execlineb -P
# Copyright (c) 2015-2017 Eric Vidal <eric@obarun.org>
# All rights reserved.
#
# This file is part of Obarun. It is subject to the license terms in
# the LICENSE file found in the top-level directory of this
# distribution and at https://github.com/Obarun/s6-boot/LICENSE
# This file may not be copied, modified, propagated, or distributed
# except according to the terms contained in the LICENSE file.
fdmove -c 2 1
if { s6-echo -- udevd-udevadm started }
s6-devd
/usr/bin/udevadm settle

View File

@@ -1 +1 @@
longrun oneshot

View File

@@ -10,8 +10,9 @@
fdmove -c 2 1 fdmove -c 2 1
if { s6-echo -- udevd-udevrules started } if { s6-echo -- udevd-udevrules started }
foreground { if {
if { udevadm trigger --action=add --type=subsystems } foreground { udevadm trigger --action=add --type=subsystems }
udevadm trigger --action=add --type=devices foreground { udevadm trigger --action=add --type=devices }
udevadm settle
} }
s6-echo -- udevd-udevrules successfully started s6-echo -- udevd-udevrules successfully started

View File

@@ -1,2 +0,0 @@
udevd-udev

View File

@@ -1 +0,0 @@
oneshot

View File

@@ -27,6 +27,7 @@ foreground {
rm -rf /tmp/ rm -rf /tmp/
} }
foreground { foreground {
if { s6-test -x /usr/bin/mountstats }
if -X { mountstats } if -X { mountstats }
if { s6-echo Umount NFS filesystem } if { s6-echo Umount NFS filesystem }
umount -a -f -t nfs4 umount -a -f -t nfs4