commit 302d43c0fcdc5b8c4408e9bab2e778f09925c84c
parent da00d998b1fbceaa02e424e2610af8014f16ee07
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Sat, 29 Oct 2022 03:11:52 +0200
Rebuild s6-rc.fileset with rc-builder functions
Diffstat:
| M | s6-rc.fileset | | | 120 | +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- |
1 file changed, 81 insertions(+), 39 deletions(-)
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -266,7 +266,7 @@ m644
CN if { ip link set lo up }
if -nt { ip addr add 127.0.0.1/8 dev lo brd + }
pipeline { ip addr show dev lo } grep -q "inet 127\\.0\\.0\\.1"
-m755
+m644
@@ -360,12 +360,19 @@ m755
/hostname d m755
/hostname/type cN oneshot m644
-/hostname/up cN hostname -F /etc/hostname m755
+/hostname/dependencies r
+/hostname/up
+CN hostname -F /etc/hostname
+m644
/loadkeys d m755
-/loadkeys/dependencies cN kbd_mode m644
/loadkeys/type cN oneshot m644
-/loadkeys/up cN loadkeys --unicode /root/keymap m644
+/loadkeys/dependencies
+C kbd_mode
+m644
+/loadkeys/up
+CN loadkeys --unicode /root/keymap
+m644
/tty1 d m755
@@ -475,41 +482,68 @@ m755
/kbd_mode-tty1 d m755
/kbd_mode-tty1/type cN oneshot m644
-/kbd_mode-tty1/up cN kbd_mode -u -C /dev/tty1 m644
+/kbd_mode-tty1/dependencies r
+/kbd_mode-tty1/up
+CN kbd_mode -u -C /dev/tty1
+m644
/kbd_mode-tty2 d m755
/kbd_mode-tty2/type cN oneshot m644
-/kbd_mode-tty2/up cN kbd_mode -u -C /dev/tty2 m644
+/kbd_mode-tty2/dependencies r
+/kbd_mode-tty2/up
+CN kbd_mode -u -C /dev/tty2
+m644
/kbd_mode-tty3 d m755
/kbd_mode-tty3/type cN oneshot m644
-/kbd_mode-tty3/up cN kbd_mode -u -C /dev/tty3 m644
+/kbd_mode-tty3/dependencies r
+/kbd_mode-tty3/up
+CN kbd_mode -u -C /dev/tty3
+m644
/kbd_mode-tty4 d m755
/kbd_mode-tty4/type cN oneshot m644
-/kbd_mode-tty4/up cN kbd_mode -u -C /dev/tty4 m644
+/kbd_mode-tty4/dependencies r
+/kbd_mode-tty4/up
+CN kbd_mode -u -C /dev/tty4
+m644
/setfont-tty1 d m755
/setfont-tty1/type cN oneshot m644
-/setfont-tty1/up cN redirfd -r 0 /dev/tty1 setfont ter-v14n m644
+/setfont-tty1/dependencies r
+/setfont-tty1/up
+CN redirfd -r 0 /dev/tty1 setfont ter-v14n
+m644
/setfont-tty2 d m755
/setfont-tty2/type cN oneshot m644
-/setfont-tty2/up cN redirfd -r 0 /dev/tty2 setfont ter-v14n m644
+/setfont-tty2/dependencies r
+/setfont-tty2/up
+CN redirfd -r 0 /dev/tty2 setfont ter-v14n
+m644
/setfont-tty3 d m755
/setfont-tty3/type cN oneshot m644
-/setfont-tty3/up cN redirfd -r 0 /dev/tty3 setfont ter-v14n m644
+/setfont-tty3/dependencies r
+/setfont-tty3/up
+CN redirfd -r 0 /dev/tty3 setfont ter-v14n
+m644
/setfont-tty4 d m755
/setfont-tty4/type cN oneshot m644
-/setfont-tty4/up cN redirfd -r 0 /dev/tty4 setfont ter-v14n m644
+/setfont-tty4/dependencies r
+/setfont-tty4/up
+CN redirfd -r 0 /dev/tty4 setfont ter-v14n
+m644
/dmesg d m755
/dmesg/type cN oneshot m644
+/dmesg/dependencies r
/dmesg/up
CN # description="Set the dmesg level for a cleaner boot"
# dmesg_level=1
dmesg -n1
-m755
+m644
/modules d m755
-/modules/dependencies cN dmesg m644
/modules/type cN oneshot m644
+/modules/dependencies
+C dmesg
+m644
/modules/up
CN foreground { modprobe af_packet }
foreground { modprobe thinkpad_acpi }
@@ -538,7 +572,7 @@ CN foreground { modprobe af_packet }
foreground { modprobe uvcvideo }
foreground { modprobe wmi_bmof }
foreground { modprobe xhci_pci }
-m755
+m644
/mdevd-coldplug d m755
/mdevd-coldplug/type cN oneshot m644
@@ -548,7 +582,9 @@ C mount-dev
modules
mdevd
m644
-/mdevd-coldplug/up c mdevd-coldplug m644
+/mdevd-coldplug/up
+CN mdevd-coldplug
+m644
/udev-coldplug d m755
/udev-coldplug/type cN oneshot m644
@@ -558,7 +594,9 @@ C mount-dev
modules
udev
m644
-/udev-coldplug/up c udevadm settle m644
+/udev-coldplug/up
+CN udevadm settle
+m644
/dev-coldplug d m755
/dev-coldplug/type cN bundle m644
@@ -567,11 +605,13 @@ C udev-coldplug
m644
/mdevd d m755
-/mdevd/type c longrun m644
-/mdevd/dependencies c mount-dev m644
-/mdevd/notification-fd c 3 m644
+/mdevd/type cN longrun m644
+/mdevd/dependencies
+C mount-dev
+m644
+/mdevd/notification-fd cN 3 m644
/mdevd/run
-C #!/command/execlineb -P
+CN #!/command/execlineb -P
mdevd -D 3 -f /current/conf/etc/mdevd.conf
m755
@@ -582,8 +622,7 @@ C mount-sys
mount-proc
mount-dev
m644
-m640
-/udev/notification-fd cN 3 m640
+/udev/notification-fd cN 3 m644
/udev/run
CN #!/command/execlineb -P
getpid SERVICE_PID
@@ -606,12 +645,16 @@ CN #!/command/execlineb -P
m755
/swapon-vg-swap d m755
+/swapon-vg-swap/type cN oneshot m644
/swapon-vg-swap/dependencies
C dev-coldplug
m644
-/swapon-vg-swap/type c oneshot m644
-/swapon-vg-swap/up c swapon /dev/vg/swap m644
-/swapon-vg-swap/down c swapoff /dev/vg/swap m644
+/swapon-vg-swap/up
+CN swapon /dev/vg/swap
+m644
+/swapon-vg-swap/down
+CN swapoff /dev/vg/swap
+m644
/mount-tmp-X11 d m755
/mount-tmp-X11/type cN oneshot m644
@@ -631,7 +674,7 @@ m644
/openrc d m755
/openrc/type cN oneshot m644
/openrc/dependencies
-CN ok-sysinit
+C ok-sysinit
ok-mount
modules
m644
@@ -694,7 +737,7 @@ m755
/ssh_host_ed25519_key d m755
/ssh_host_ed25519_key/type cN oneshot m644
/ssh_host_ed25519_key/dependencies
-CN hostname
+C hostname
rootfs
m644
/ssh_host_ed25519_key/up
@@ -705,7 +748,7 @@ m644
/ssh_host_rsa_key d m755
/ssh_host_rsa_key/type cN oneshot m644
/ssh_host_rsa_key/dependencies
-CN hostname
+C hostname
rootfs
m644
/ssh_host_rsa_key/up
@@ -714,12 +757,12 @@ CN if -n -t { s6-test -f /etc/ssh/ssh_host_rsa_key }
m644
-/alsa-devices d m750
+/alsa-devices d m755
+/alsa-devices/type cN oneshot m644
/alsa-devices/dependencies
-CN modules
+C modules
udev
-m640
-/alsa-devices/type cN oneshot m640
+m644
/alsa-devices/up
CN sh -c "
retry=true
@@ -733,7 +776,7 @@ CN sh -c "
done
:
"
-m640
+m644
/alsactl-rdaemon-log d m755
/alsactl-rdaemon-log/type cN longrun m644
@@ -796,7 +839,7 @@ m644
/tlp/up
CN tlp init start
m644
-/tlp/finish
+/tlp/down
CN tlp init stop
m644
@@ -819,7 +862,7 @@ m644
C ok-sysinit
rootfs
m644
-/svscan-ccx-log/consumer-for cN svscan-ccx m640
+/svscan-ccx-log/consumer-for cN svscan-ccx m644
/svscan-ccx-log/run
CN #!/command/execlineb -P
getpid SERVICE_PID
@@ -845,9 +888,8 @@ m755
C ok-sysinit
rootfs
m644
-/svscan-ccx/notification-fd cN 3
-m644
-/svscan-ccx/producer-for cN svscan-ccx-log m640
+/svscan-ccx/notification-fd cN 3 m644
+/svscan-ccx/producer-for cN svscan-ccx-log m644
/svscan-ccx/run
CN #!/command/execlineb -P
getpid SERVICE_PID
