commit 20db90ae56c1b9dfdcab9d9136ea8f9a5ff295dd
parent d4d8812908e64ae0e8ca233bfeef7e028d77acec
Author: ccx <ccx@te2000.cz>
Date: Mon, 4 Mar 2024 20:10:26 +0000
disable services before first boot, configure filesystems
Diffstat:
8 files changed, 163 insertions(+), 846 deletions(-)
diff --git a/config.aat b/config.aat
@@ -11,57 +11,63 @@ getty_max=4
tty_setfont=ter-v14n
-dev_manager=udev
+dev_manager=mdevd
enable_loopback=1
enable_dhcpcd=1
enable_unbound=1
enable_loadkeys=1
enable_sshd=1
-enable_alsactl_rdaemon=1
-enable_brightness=1
-enable_tlp=1
+#enable_alsactl_rdaemon=1
+#enable_brightness=1
+#enable_tlp=1
enable_containers=1
-enable_syncthing=1
+#enable_syncthing=1
enable_wpa_supplicant=1
-X_servers=[
-svc vtN
-X5 5
-X6 6
-X7 7
-X8 8
-]
+#X_servers=[
+#svc vtN
+#X5 5
+#X6 6
+#X7 7
+#X8 8
+#]
modprobe_modules=[
module
-af_packet
-thinkpad_acpi
-iwldvm
-evdev
-psmouse
-elan_i2c
-snd-hda-intel
-fuse
-overlay
-kvm-intel
-tun
-cpufreq_conservative
-cpufreq_ondemand
-cpufreq_powersave
-cpufreq_userspace
-ac
-ehci_pci
-hid_generic
-input_leds
-intel_rapl_msr
-pcspkr
-rapl
-thermal
-usbhid
-uvcvideo
-wmi_bmof
+mt7921e
+usb_storage
xhci_pci
+kvm-amd
+ccp
+snd-hda-intel
+snd_pci_acp3x
+|#
+|#af_packet
+|#thinkpad_acpi
+|#iwldvm
+|#evdev
+|#psmouse
+|#elan_i2c
+|#fuse
+|#overlay
+|#tun
+|#cpufreq_conservative
+|#cpufreq_ondemand
+|#cpufreq_powersave
+|#cpufreq_userspace
+|#ac
+|#ehci_pci
+|#hid_generic
+|#input_leds
+|#intel_rapl_msr
+|#pcspkr
+|#rapl
+|#thermal
+|#usbhid
+|#uvcvideo
+|#wmi_bmof
+|#xhci_pci
|# USB ethernet
r8153_ecm
]
@@ -82,9 +88,9 @@ id name
1000 ccx
]
-tinc_networks=[
-name
-ccx
-]
+|#tinc_networks=[
+|#name
+|#ccx
+|#]
|}
diff --git a/fs b/fs
@@ -55,7 +55,7 @@
# options=rw,nosuid,nodev,mode=755
-/run/cgroup2
+/run/cgroup
source=none
type=cgroup2
mkdir=true
@@ -72,50 +72,20 @@
/boot
source=/dev/sda1
- type=ext3
+ type=ext4
options=ro,nosuid
bundles=ok-localmount
/home
source=/dev/mapper/vg-home
- type=ext4
- options=noatime,nosuid
- bundles=ok-localmount
-
-/mnt/sysrcd
- source=/boot/sysrcd.dat
- type=squashfs
- options=ro,loop,nosuid
- bundles=ok-localmount
-
-/mnt/mmc
- source=/dev/mmcblk0p1
- type=vfat
- options=ro,iocharset=utf8
- bundles=ok-localmount
-
-/mnt/volumes/video
- source=/dev/mapper/vg-video
type=xfs
options=noatime,nosuid
bundles=ok-localmount
-/mnt/volumes/audio
- source=/dev/mapper/vg-audio
- type=xfs
- options=noatime,nosuid
- bundles=ok-localmount
-
-/mnt/volumes/photos
- source=/dev/mapper/vg-photos
- type=xfs
- options=noatime,nosuid
- bundles=ok-localmount
-
-/var/lib/syncthing
- source=/dev/mapper/vg-syncthing
- type=xfs
- options=noatime,nosuid
+/mnt/sd
+ source=/dev/mmcblk0p1
+ type=f2fs
+ options=ro,nosuid,nodev
bundles=ok-localmount
/mnt/volumes/containers
diff --git a/rc-builder.include.awk b/rc-builder.include.awk
@@ -160,6 +160,6 @@ function run_arg(cmd){
function run_el(){
assert_service_type("longrun", "run_el()")
flush_current_file()
- runscript_el_cgroup2(current_service_name)
+ runscript_el_cgroup_v2(current_service_name)
current_file_mode = "755"
}
diff --git a/rc-common.aat b/rc-common.aat
@@ -20,29 +20,29 @@
|function longrun(name, deps) {
| return service(name, "longrun", deps)
|}
-|function runscript_el_cgroup2(svc_name) {
+|function runscript_el_cgroup_v2(svc_name) {
/{{svc_name}}/run
CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/{{svc_name}} }
- redirfd -w 1 /run/cgroup2/s6-rc/{{svc_name}}/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/{{svc_name}} }
+ redirfd -w 1 /run/cgroup/s6-rc/{{svc_name}}/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
|}
|function runscript_simple(svc_name, cmd) {
-|runscript_el_cgroup2(svc_name)
+|runscript_el_cgroup_v2(svc_name)
fdmove -c 2 1
{{cmd}}
m755
|}
|function longrun_with_logger(name, deps) {
-| longrun(name "-log", "mount-run-cgroup2\nrootfs")
+| longrun(name "-log", "mount-run-cgroup\nrootfs")
/{{name}}-log/consumer-for cN {{name}} m640
-|runscript_el_cgroup2(name "-log")
+|runscript_el_cgroup_v2(name "-log")
if { mkdir -p /var/log/{{name}} }
s6-log -b -- n10 s10240000 t /var/log/{{name}}
m755
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -125,7 +125,7 @@
@endfor
|end()
-|start_oneshot("cgroups", "mount-run-cgroup2")
+|start_oneshot("cgroups", "mount-run-cgroup")
|in_bundle("ok-sysinit")
|up()
cgconfigparser -l /current/conf/etc/cgconfig.conf
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -78,15 +78,15 @@ CN # mount mqueue on /dev/mqueue
if { mkdir -p "/dev/mqueue" }
if -n -t { mount -t "mqueue" -o "remount,rw,nosuid,nodev,noexec" "mqueue" "/dev/mqueue" }
mount -t "mqueue" -o "rw,nosuid,nodev,noexec" "mqueue" "/dev/mqueue"
-/mount-run-cgroup2 d m755
-/mount-run-cgroup2/type cN oneshot m644
-/mount-run-cgroup2/dependencies r
-/mount-run-cgroup2/down cN s6-umount "/run/cgroup2" m644
-/mount-run-cgroup2/up
-CN # mount none on /run/cgroup2
- if { mkdir -p "/run/cgroup2" }
- if -n -t { mount -t "cgroup2" -o "remount,rw" "none" "/run/cgroup2" }
- mount -t "cgroup2" -o "rw" "none" "/run/cgroup2"
+/mount-run-cgroup d m755
+/mount-run-cgroup/type cN oneshot m644
+/mount-run-cgroup/dependencies r
+/mount-run-cgroup/down cN s6-umount "/run/cgroup" m644
+/mount-run-cgroup/up
+CN # mount none on /run/cgroup
+ if { mkdir -p "/run/cgroup" }
+ if -n -t { mount -t "cgroup2" -o "remount,rw" "none" "/run/cgroup" }
+ mount -t "cgroup2" -o "rw" "none" "/run/cgroup"
/mount-boot d m755
/mount-boot/type cN oneshot m644
/mount-boot/dependencies
@@ -98,8 +98,8 @@ m644
/mount-boot/up
CN # mount /dev/sda1 on /boot
if { mkdir -p "/boot" }
- if -n -t { mount -t "ext3" -o "remount,ro,nosuid" "/dev/sda1" "/boot" }
- mount -t "ext3" -o "ro,nosuid" "/dev/sda1" "/boot"
+ if -n -t { mount -t "ext4" -o "remount,ro,nosuid" "/dev/sda1" "/boot" }
+ mount -t "ext4" -o "ro,nosuid" "/dev/sda1" "/boot"
/mount-home d m755
/mount-home/type cN oneshot m644
/mount-home/dependencies
@@ -111,86 +111,21 @@ m644
/mount-home/up
CN # mount /dev/mapper/vg-home on /home
if { mkdir -p "/home" }
- if -n -t { mount -t "ext4" -o "remount,noatime,nosuid" "/dev/mapper/vg-home" "/home" }
- mount -t "ext4" -o "noatime,nosuid" "/dev/mapper/vg-home" "/home"
-/mount-mnt-sysrcd d m755
-/mount-mnt-sysrcd/type cN oneshot m644
-/mount-mnt-sysrcd/dependencies
+ if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-home" "/home" }
+ mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-home" "/home"
+/mount-mnt-sd d m755
+/mount-mnt-sd/type cN oneshot m644
+/mount-mnt-sd/dependencies
C
rootfs
m644
-/mount-mnt-sysrcd/down cN s6-umount "/mnt/sysrcd" m644
-/mount-mnt-sysrcd/up
-CN # mount /boot/sysrcd.dat on /mnt/sysrcd
- if { mkdir -p "/mnt/sysrcd" }
- if -n -t { mount -t "squashfs" -o "remount,ro,loop,nosuid" "/boot/sysrcd.dat" "/mnt/sysrcd" }
- mount -t "squashfs" -o "ro,loop,nosuid" "/boot/sysrcd.dat" "/mnt/sysrcd"
-/mount-mnt-mmc d m755
-/mount-mnt-mmc/type cN oneshot m644
-/mount-mnt-mmc/dependencies
-C
- rootfs
-
-m644
-/mount-mnt-mmc/down cN s6-umount "/mnt/mmc" m644
-/mount-mnt-mmc/up
-CN # mount /dev/mmcblk0p1 on /mnt/mmc
- if { mkdir -p "/mnt/mmc" }
- if -n -t { mount -t "vfat" -o "remount,ro,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc" }
- mount -t "vfat" -o "ro,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc"
-/mount-mnt-volumes-video d m755
-/mount-mnt-volumes-video/type cN oneshot m644
-/mount-mnt-volumes-video/dependencies
-C
- rootfs
-
-m644
-/mount-mnt-volumes-video/down cN s6-umount "/mnt/volumes/video" m644
-/mount-mnt-volumes-video/up
-CN # mount /dev/mapper/vg-video on /mnt/volumes/video
- if { mkdir -p "/mnt/volumes/video" }
- if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-video" "/mnt/volumes/video" }
- mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-video" "/mnt/volumes/video"
-/mount-mnt-volumes-audio d m755
-/mount-mnt-volumes-audio/type cN oneshot m644
-/mount-mnt-volumes-audio/dependencies
-C
- rootfs
-
-m644
-/mount-mnt-volumes-audio/down cN s6-umount "/mnt/volumes/audio" m644
-/mount-mnt-volumes-audio/up
-CN # mount /dev/mapper/vg-audio on /mnt/volumes/audio
- if { mkdir -p "/mnt/volumes/audio" }
- if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-audio" "/mnt/volumes/audio" }
- mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-audio" "/mnt/volumes/audio"
-/mount-mnt-volumes-photos d m755
-/mount-mnt-volumes-photos/type cN oneshot m644
-/mount-mnt-volumes-photos/dependencies
-C
- rootfs
-
-m644
-/mount-mnt-volumes-photos/down cN s6-umount "/mnt/volumes/photos" m644
-/mount-mnt-volumes-photos/up
-CN # mount /dev/mapper/vg-photos on /mnt/volumes/photos
- if { mkdir -p "/mnt/volumes/photos" }
- if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-photos" "/mnt/volumes/photos" }
- mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-photos" "/mnt/volumes/photos"
-/mount-var-lib-syncthing d m755
-/mount-var-lib-syncthing/type cN oneshot m644
-/mount-var-lib-syncthing/dependencies
-C
- rootfs
-
-m644
-/mount-var-lib-syncthing/down cN s6-umount "/var/lib/syncthing" m644
-/mount-var-lib-syncthing/up
-CN # mount /dev/mapper/vg-syncthing on /var/lib/syncthing
- if { mkdir -p "/var/lib/syncthing" }
- if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-syncthing" "/var/lib/syncthing" }
- mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-syncthing" "/var/lib/syncthing"
+/mount-mnt-sd/down cN s6-umount "/mnt/sd" m644
+/mount-mnt-sd/up
+CN # mount /dev/mmcblk0p1 on /mnt/sd
+ if { mkdir -p "/mnt/sd" }
+ if -n -t { mount -t "f2fs" -o "remount,ro,nosuid,nodev" "/dev/mmcblk0p1" "/mnt/sd" }
+ mount -t "f2fs" -o "ro,nosuid,nodev" "/dev/mmcblk0p1" "/mnt/sd"
/mount-mnt-volumes-containers d m755
/mount-mnt-volumes-containers/type cN oneshot m644
/mount-mnt-volumes-containers/dependencies
@@ -226,7 +161,7 @@ C mount-sys
mount-dev-pts
mount-dev-shm
mount-dev-mqueue
- mount-run-cgroup2
+ mount-run-cgroup
m644
/ok-localmount d m755
@@ -235,12 +170,7 @@ m644
C rootfs
mount-boot
mount-home
- mount-mnt-sysrcd
- mount-mnt-mmc
- mount-mnt-volumes-video
- mount-mnt-volumes-audio
- mount-mnt-volumes-photos
- mount-var-lib-syncthing
+ mount-mnt-sd
mount-mnt-volumes-containers
mount-mnt-volumes-containers-user
m644
@@ -267,7 +197,7 @@ m644
/dhcpcd-log d m755
/dhcpcd-log/type cN longrun m644
/dhcpcd-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/dhcpcd-log/consumer-for cN dhcpcd m640
@@ -276,9 +206,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/dhcpcd-log }
- redirfd -w 1 /run/cgroup2/s6-rc/dhcpcd-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/dhcpcd-log }
+ redirfd -w 1 /run/cgroup/s6-rc/dhcpcd-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -298,9 +228,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/dhcpcd }
- redirfd -w 1 /run/cgroup2/s6-rc/dhcpcd/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/dhcpcd }
+ redirfd -w 1 /run/cgroup/s6-rc/dhcpcd/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -311,7 +241,7 @@ m755
/unbound-log d m755
/unbound-log/type cN longrun m644
/unbound-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/unbound-log/consumer-for cN unbound m640
@@ -320,9 +250,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/unbound-log }
- redirfd -w 1 /run/cgroup2/s6-rc/unbound-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/unbound-log }
+ redirfd -w 1 /run/cgroup/s6-rc/unbound-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -342,9 +272,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/unbound }
- redirfd -w 1 /run/cgroup2/s6-rc/unbound/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/unbound }
+ redirfd -w 1 /run/cgroup/s6-rc/unbound/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -379,9 +309,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty1 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty1/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/tty1 }
+ redirfd -w 1 /run/cgroup/s6-rc/tty1/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -405,9 +335,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty2 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty2/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/tty2 }
+ redirfd -w 1 /run/cgroup/s6-rc/tty2/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -431,9 +361,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty3 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty3/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/tty3 }
+ redirfd -w 1 /run/cgroup/s6-rc/tty3/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -457,9 +387,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty4 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty4/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/tty4 }
+ redirfd -w 1 /run/cgroup/s6-rc/tty4/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -539,40 +469,20 @@ m644
C dmesg
m644
/modules/up
-CN foreground { modprobe af_packet }
- foreground { modprobe thinkpad_acpi }
- foreground { modprobe iwldvm }
- foreground { modprobe evdev }
- foreground { modprobe psmouse }
- foreground { modprobe elan_i2c }
- foreground { modprobe snd-hda-intel }
- foreground { modprobe fuse }
- foreground { modprobe overlay }
- foreground { modprobe kvm-intel }
- foreground { modprobe tun }
- foreground { modprobe cpufreq_conservative }
- foreground { modprobe cpufreq_ondemand }
- foreground { modprobe cpufreq_powersave }
- foreground { modprobe cpufreq_userspace }
- foreground { modprobe ac }
- foreground { modprobe ehci_pci }
- foreground { modprobe hid_generic }
- foreground { modprobe input_leds }
- foreground { modprobe intel_rapl_msr }
- foreground { modprobe pcspkr }
- foreground { modprobe rapl }
- foreground { modprobe thermal }
- foreground { modprobe usbhid }
- foreground { modprobe uvcvideo }
- foreground { modprobe wmi_bmof }
+CN foreground { modprobe mt7921e }
+ foreground { modprobe usb_storage }
foreground { modprobe xhci_pci }
+ foreground { modprobe kvm-amd }
+ foreground { modprobe ccp }
+ foreground { modprobe snd-hda-intel }
+ foreground { modprobe snd_pci_acp3x }
foreground { modprobe r8153_ecm }
m644
/cgroups d m755
/cgroups/type cN oneshot m644
/cgroups/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
m644
/cgroups/up
CN cgconfigparser -l /current/conf/etc/cgconfig.conf
@@ -605,7 +515,7 @@ m644
/dev-coldplug d m755
/dev-coldplug/type cN bundle m644
/dev-coldplug/contents
-C udev-coldplug
+C mdevd-coldplug
m644
/mdevd d m755
@@ -632,9 +542,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/udev }
- redirfd -w 1 /run/cgroup2/s6-rc/udev/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/udev }
+ redirfd -w 1 /run/cgroup/s6-rc/udev/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -695,7 +605,7 @@ m644
/sshd-log d m755
/sshd-log/type cN longrun m644
/sshd-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/sshd-log/consumer-for cN sshd m640
@@ -704,9 +614,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/sshd-log }
- redirfd -w 1 /run/cgroup2/s6-rc/sshd-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/sshd-log }
+ redirfd -w 1 /run/cgroup/s6-rc/sshd-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -726,9 +636,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/sshd }
- redirfd -w 1 /run/cgroup2/s6-rc/sshd/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/sshd }
+ redirfd -w 1 /run/cgroup/s6-rc/sshd/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -783,7 +693,7 @@ m644
/alsactl-rdaemon-log d m755
/alsactl-rdaemon-log/type cN longrun m644
/alsactl-rdaemon-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/alsactl-rdaemon-log/consumer-for cN alsactl-rdaemon m640
@@ -792,9 +702,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/alsactl-rdaemon-log }
- redirfd -w 1 /run/cgroup2/s6-rc/alsactl-rdaemon-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/alsactl-rdaemon-log }
+ redirfd -w 1 /run/cgroup/s6-rc/alsactl-rdaemon-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -812,9 +722,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/alsactl-rdaemon }
- redirfd -w 1 /run/cgroup2/s6-rc/alsactl-rdaemon/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/alsactl-rdaemon }
+ redirfd -w 1 /run/cgroup/s6-rc/alsactl-rdaemon/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -870,9 +780,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/svscan-ccx-log }
- redirfd -w 1 /run/cgroup2/s6-rc/svscan-ccx-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/svscan-ccx-log }
+ redirfd -w 1 /run/cgroup/s6-rc/svscan-ccx-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -897,9 +807,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/svscan-ccx }
- redirfd -w 1 /run/cgroup2/s6-rc/svscan-ccx/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/svscan-ccx }
+ redirfd -w 1 /run/cgroup/s6-rc/svscan-ccx/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -915,7 +825,7 @@ m755
/syncthing-log d m755
/syncthing-log/type cN longrun m644
/syncthing-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/syncthing-log/consumer-for cN syncthing m640
@@ -924,9 +834,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/syncthing-log }
- redirfd -w 1 /run/cgroup2/s6-rc/syncthing-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/syncthing-log }
+ redirfd -w 1 /run/cgroup/s6-rc/syncthing-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -944,9 +854,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/syncthing }
- redirfd -w 1 /run/cgroup2/s6-rc/syncthing/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/syncthing }
+ redirfd -w 1 /run/cgroup/s6-rc/syncthing/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -955,52 +865,11 @@ CN #!/command/execlineb -P
syncthing -logflags 0
m755
-/tinc.ccx-log d m755
-/tinc.ccx-log/type cN longrun m644
-/tinc.ccx-log/dependencies
-C mount-run-cgroup2
- rootfs
-m644
-/tinc.ccx-log/consumer-for cN tinc.ccx m640
-/tinc.ccx-log/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tinc.ccx-log }
- redirfd -w 1 /run/cgroup2/s6-rc/tinc.ccx-log/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
- if { mkdir -p /var/log/tinc.ccx }
- s6-log -b -- n10 s10240000 t /var/log/tinc.ccx
-m755
-/tinc.ccx d m755
-/tinc.ccx/type cN longrun m644
-/tinc.ccx/dependencies
-C net-all
-m644
-/tinc.ccx/producer-for cN tinc.ccx-log m640
-/tinc.ccx/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tinc.ccx }
- redirfd -w 1 /run/cgroup2/s6-rc/tinc.ccx/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
- fdmove -c 2 1
- tincd -n "ccx" -D -d
-m755
/wpa_supplicant-log d m755
/wpa_supplicant-log/type cN longrun m644
/wpa_supplicant-log/dependencies
-C mount-run-cgroup2
+C mount-run-cgroup
rootfs
m644
/wpa_supplicant-log/consumer-for cN wpa_supplicant m640
@@ -1009,9 +878,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/wpa_supplicant-log }
- redirfd -w 1 /run/cgroup2/s6-rc/wpa_supplicant-log/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/wpa_supplicant-log }
+ redirfd -w 1 /run/cgroup/s6-rc/wpa_supplicant-log/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -1030,9 +899,9 @@ CN #!/command/execlineb -P
getpid SERVICE_PID
foreground {
importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/wpa_supplicant }
- redirfd -w 1 /run/cgroup2/s6-rc/wpa_supplicant/cgroup.procs
+ if { test -d /run/cgroup }
+ if { mkdir -p /run/cgroup/s6-rc/wpa_supplicant }
+ redirfd -w 1 /run/cgroup/s6-rc/wpa_supplicant/cgroup.procs
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
@@ -1042,105 +911,6 @@ CN #!/command/execlineb -P
m755
-/.scripts d m755
-/.scripts/X.run
-CN #!/command/execlineb -P
- fdmove -c 2 1
- s6-envdir env
- importas vtN vtN
- export XDG_RUNTIME_DIR /run/service/X${vtN}/data
- importas XDG_RUNTIME_DIR XDG_RUNTIME_DIR
- if { truncate -s 0 ${XDG_RUNTIME_DIR}/Xauthority }
- if { chmod 600 ${XDG_RUNTIME_DIR}/Xauthority }
- if { chown xorg:xorg ${XDG_RUNTIME_DIR}/Xauthority }
- if { chown xorg:xorg ${XDG_RUNTIME_DIR} }
- if {
- pipeline {
- if { printf "add :%d . " ${vtN} }
- if { redirfd -r 0 /dev/urandom xxd -p -l 16 }
- }
- xauth -f ${XDG_RUNTIME_DIR}/Xauthority source -
- }
- piperw 4 5
- background -d {
- fdclose 5
- if { mkdir -p ${XDG_RUNTIME_DIR}/env }
- if {
- redirfd -w 1 ${XDG_RUNTIME_DIR}/env/XAUTHORITY
- printf "%s/Xauthority" ${XDG_RUNTIME_DIR}
- }
- if {
- fdmove 0 4
- redirfd -w 1 ${XDG_RUNTIME_DIR}/env/DISPLAY
- if { printf : }
- head -n1
- }
- fdmove 1 3
- echo
- }
- unexport !
- fdclose 4
- fdclose 3
- umask 077
- if { chmod 660 /dev/tty${vtN} }
- if { chown root:xorg /dev/tty${vtN} }
- if {
- elglob dev /dev/input/event*
- if { chown root:input ${dev} }
- chmod 660 ${dev}
- }
- redirfd -r 0 /dev/tty${vtN}
- redirfd -w 1 /dev/tty${vtN}
- s6-setsid
- s6-setuidgid xorg
- Xorg
- -displayfd 5
- -nolisten local
- -nolisten tcp
- -quiet
- # -logfile /dev/stdout
- -logfile ${XDG_RUNTIME_DIR}/log
- -auth ${XDG_RUNTIME_DIR}/Xauthority
- -tst
- -retro
- -novtswitch
- vt${vtN} :${vtN}
-
-m755
-
-/X5 d m750
-/X5/data d m750
-/X5/data/.keep cN m640
-/X5/env d m750
-/X5/env/vtN cN 5 m640
-/X5/notification-fd cN 3 m640
-/X5/run l ../.scripts/X.run m777
-/X5/type cN longrun m640
-/X6 d m750
-/X6/data d m750
-/X6/data/.keep cN m640
-/X6/env d m750
-/X6/env/vtN cN 6 m640
-/X6/notification-fd cN 3 m640
-/X6/run l ../.scripts/X.run m777
-/X6/type cN longrun m640
-/X7 d m750
-/X7/data d m750
-/X7/data/.keep cN m640
-/X7/env d m750
-/X7/env/vtN cN 7 m640
-/X7/notification-fd cN 3 m640
-/X7/run l ../.scripts/X.run m777
-/X7/type cN longrun m640
-/X8 d m750
-/X8/data d m750
-/X8/data/.keep cN m640
-/X8/env d m750
-/X8/env/vtN cN 8 m640
-/X8/notification-fd cN 3 m640
-/X8/run l ../.scripts/X.run m777
-/X8/type cN longrun m640
-
/gettys d m755
/gettys/type cN bundle m644
@@ -1188,13 +958,8 @@ C net-all
modules
swapon-vg-swap
sshd
- alsactl-rdaemon
- brightness
- tlp
containers
svscan-ccx
- syncthing
- tinc.ccx
m644
/ok-mount d m755
@@ -1211,7 +976,7 @@ m644
C mount-sysinit
dev-coldplug
cgroups
- udev
+ mdevd
m644
/setfont d m755
diff --git a/s6-rc.fileset.orig b/s6-rc.fileset.orig
@@ -1,419 +0,0 @@
-/ d o0:0 m755
-/dhcpcd d o0:0 m755
-/dhcpcd/dependencies
-CN modules
- ok-mount
- ok-sysinit
-o0:0 m644
-/dhcpcd/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/dhcpcd }
- redirfd -w 1 /run/cgroup2/s6-rc/dhcpcd/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- dhcpcd --nobackground
-o0:0 m755
-/dhcpcd/type cN longrun o0:0 m644
-/dmesg d o0:0 m755
-/dmesg/type cN oneshot o0:0 m644
-/dmesg/up
-CN # description="Set the dmesg level for a cleaner boot"
- # dmesg_level=1
- dmesg -n1
-o0:0 m755
-/gettys d o0:0 m755
-/gettys/contents
-CN tty1
- tty3
- tty2
- tty4
-o0:0 m644
-/gettys/type cN bundle o0:0 m644
-/.git cN gitdir: ../.git/modules/carbon-s6-rc o0:0 m644
-/.gitignore cN .*.sw[po] o0:0 m644
-/hostname d o0:0 m755
-/hostname/type cN oneshot o0:0 m644
-/hostname/up cN hostname -F /etc/hostname o0:0 m755
-/kbd_mode d o0:0 m755
-/kbd_mode/contents
-CN kbd_mode-tty1
- kbd_mode-tty2
- kbd_mode-tty3
- kbd_mode-tty4
- kbd_mode-tty9
- kbd_mode-tty10
- kbd_mode-tty11
- kbd_mode-tty12
-o0:0 m644
-/kbd_mode-tty1 d o0:0 m755
-/kbd_mode-tty1/type cN oneshot o0:0 m644
-/kbd_mode-tty1/up cN kbd_mode -u -C /dev/tty1 o0:0 m644
-/kbd_mode-tty10 d o0:0 m755
-/kbd_mode-tty10/type cN oneshot o0:0 m644
-/kbd_mode-tty10/up cN kbd_mode -u -C /dev/tty10 o0:0 m644
-/kbd_mode-tty11 d o0:0 m755
-/kbd_mode-tty11/type cN oneshot o0:0 m644
-/kbd_mode-tty11/up cN kbd_mode -u -C /dev/tty11 o0:0 m644
-/kbd_mode-tty12 d o0:0 m755
-/kbd_mode-tty12/type cN oneshot o0:0 m644
-/kbd_mode-tty12/up cN kbd_mode -u -C /dev/tty12 o0:0 m644
-/kbd_mode-tty2 d o0:0 m755
-/kbd_mode-tty2/type cN oneshot o0:0 m644
-/kbd_mode-tty2/up cN kbd_mode -u -C /dev/tty2 o0:0 m644
-/kbd_mode-tty3 d o0:0 m755
-/kbd_mode-tty3/type cN oneshot o0:0 m644
-/kbd_mode-tty3/up cN kbd_mode -u -C /dev/tty3 o0:0 m644
-/kbd_mode-tty4 d o0:0 m755
-/kbd_mode-tty4/type cN oneshot o0:0 m644
-/kbd_mode-tty4/up cN kbd_mode -u -C /dev/tty4 o0:0 m644
-/kbd_mode-tty5 d o0:0 m755
-/kbd_mode-tty5/type cN oneshot o0:0 m644
-/kbd_mode-tty5/up cN kbd_mode -u -C /dev/tty5 o0:0 m644
-/kbd_mode-tty6 d o0:0 m755
-/kbd_mode-tty6/type cN oneshot o0:0 m644
-/kbd_mode-tty6/up cN kbd_mode -u -C /dev/tty6 o0:0 m644
-/kbd_mode-tty7 d o0:0 m755
-/kbd_mode-tty7/type cN oneshot o0:0 m644
-/kbd_mode-tty7/up cN kbd_mode -u -C /dev/tty7 o0:0 m644
-/kbd_mode-tty8 d o0:0 m755
-/kbd_mode-tty8/type cN oneshot o0:0 m644
-/kbd_mode-tty8/up cN kbd_mode -u -C /dev/tty8 o0:0 m644
-/kbd_mode-tty9 d o0:0 m755
-/kbd_mode-tty9/type cN oneshot o0:0 m644
-/kbd_mode-tty9/up cN kbd_mode -u -C /dev/tty9 o0:0 m644
-/kbd_mode/type cN bundle o0:0 m644
-/loadkeys d o0:0 m755
-/loadkeys/dependencies cN kbd_mode o0:0 m644
-/loadkeys/type cN oneshot o0:0 m644
-/loadkeys/up cN loadkeys --unicode /root/keymap o0:0 m644
-/localmount d o0:0 m755
-/localmount/dependencies
-CN ok-sysinit
- modules
- root-writable
-o0:0 m644
-/localmount/down
-CN # umount all filesystems except specials, if possible
- foreground { umount --all --verbose --detach-loop -t nodevtmpfs,noproc,nosysfs,nodevpts,nomqueue }
- # remount the rest read-only, except for tmpfs
- foreground { umount --all --read-only --verbose -t nodevtmpfs,noproc,nosysfs,nodevpts,nomqueue,notmpfs }
-o0:0 m644
-/localmount/type cN oneshot o0:0 m644
-/localmount/up cN mount -at noproc -O no_netdev o0:0 m644
-/loopback d o0:0 m755
-/loopback/type cN oneshot o0:0 m644
-/loopback/up
-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"
-o0:0 m755
-/modules d o0:0 m755
-/modules/dependencies cN dmesg o0:0 m644
-/modules/type cN oneshot o0:0 m644
-/modules/up
-CN foreground { modprobe fuse }
- foreground { modprobe overlay }
- foreground { modprobe tun }
- foreground { modprobe e1000 }
- foreground { modprobe vmxnet3 }
- foreground { modprobe virtio_pci }
- foreground { modprobe virtio_net }
-o0:0 m755
-/mount-dev d o0:0 m755
-/mount-dev/contents cN mount-devtmpfs o0:0 m644
-/mount-dev-mqueue d o0:0 m755
-/mount-dev-mqueue/dependencies cN mount-dev o0:0 m644
-/mount-dev-mqueue/down cN s6-umount /dev/mqueue o0:0 m644
-/mount-dev-mqueue/type cN oneshot o0:0 m644
-/mount-dev-mqueue/up cN sh -xc "mkdir -p /dev/mqueue || exit $?; mount -t mqueue mqueue /dev/mqueue -o remount,rw,nosuid,nodev,noexec || mount -t mqueue mqueue /dev/mqueue -o nosuid,nodev,noexec" o0:0 m644
-/mount-dev-pts d o0:0 m755
-/mount-dev-pts/dependencies cN mount-dev o0:0 m644
-/mount-dev-pts/down cN s6-umount /dev/pts o0:0 m644
-/mount-dev-pts/type cN oneshot o0:0 m644
-/mount-dev-pts/up cN sh -xc "mkdir -p /dev/pts || exit $?; mount -wt devpts devpts /dev/pts -o remount,rw,relatime,mode=600,ptmxmode=000 || exec mount -wt devpts devpts /dev/pts -o rw,relatime,mode=600,ptmxmode=000" o0:0 m644
-/mount-dev-shm d o0:0 m755
-/mount-dev-shm/dependencies cN mount-dev o0:0 m644
-/mount-dev-shm/down cN foreground { s6-umount /dev/shm } o0:0 m644
-/mount-dev-shm/type cN oneshot o0:0 m644
-/mount-dev-shm/up cN sh -xc "mount -wt tmpfs shm /dev/shm -o remount,rw,nosuid,nodev,relatime || exec mount -wt tmpfs shm /dev/shm -o rw,nosuid,nodev,relatime" o0:0 m644
-/mount-devtmpfs d o0:0 m755
-/mount-devtmpfs/down cN s6-umount /dev o0:0 m644
-/mount-devtmpfs/type cN oneshot o0:0 m644
-/mount-devtmpfs/up cN sh -xc "mount -wt devtmpfs dev /dev -o remount,nosuid || exec mount -wt devtmpfs dev /dev -o nosuid" o0:0 m644
-/mount-dev/type cN bundle o0:0 m644
-/mount-proc d o0:0 m755
-/mount-proc/down cN s6-umount /proc o0:0 m644
-/mount-proc/type cN oneshot o0:0 m644
-/mount-proc/up cN sh -xc "mount -wt proc proc /proc -o remount || mount -wt proc proc /proc" o0:0 m644
-/mount-run-cgroup2 d o0:0 m755
-/mount-run-cgroup2/down cN s6-umount /run/cgroup2 o0:0 m644
-/mount-run-cgroup2/type cN oneshot o0:0 m644
-/mount-run-cgroup2/up
-CN if { mkdir /run/cgroup2 }
- mount -t cgroup2 none /run/cgroup2
-o0:0 m644
-/mount-sys d o0:0 m755
-/mount-sys/down cN s6-umount /sys o0:0 m644
-/mount-sys/type cN oneshot o0:0 m644
-/mount-sys/up cN sh -xc "mount -wt sysfs sys /sys -o remount || exec mount -wt sysfs sys /sys" o0:0 m644
-/mount-tmp-X11 d o0:0 m755
-/mount-tmp-X11/down cN foreground { umount /tmp/.X11-unix } o0:0 m644
-/mount-tmp-X11/type cN oneshot o0:0 m644
-/mount-tmp-X11/up
-CN if { mkdir -p /tmp/.X11-unix /run/X11 }
- if { chmod 771 /run/X11 }
- if { chown root:xorg /run/X11 }
- mount --bind /run/X11 /tmp/.X11-unix
-o0:0 m644
-/net-all d o0:0 m755
-/net-all/contents
-CN dhcpcd
- unbound
- loopback
-o0:0 m644
-/net-all/type cN bundle o0:0 m644
-/ok-all d o0:0 m755
-/ok-all-but-tty d o0:0 m755
-/ok-all-but-tty/contents
-CN ok-mount
- net-all
- setfont
- dmesg
- hostname
- modules
- sshd
-o0:0 m644
-/ok-all-but-tty/type cN bundle o0:0 m644
-/ok-all/contents
-CN ok-all-but-tty
- gettys
-o0:0 m644
-/ok-all/type cN bundle o0:0 m644
-/ok-mount d o0:0 m755
-/ok-mount/contents
-CN ok-sysinit
- localmount
- root-writable
-o0:0 m644
-/ok-mount/type cN bundle o0:0 m644
-/ok-sysinit d o0:0 m755
-/ok-sysinit/contents
-CN mount-dev
- mount-dev-mqueue
- mount-dev-pts
- mount-dev-shm
- mount-proc
- mount-sys
- mount-run-cgroup2
-o0:0 m644
-/ok-sysinit/type cN bundle o0:0 m644
-/openrc d o0:0 m755
-/openrc/dependencies
-CN ok-sysinit
- ok-mount
- modules
-o0:0 m644
-/openrc/down
-CN export TERM "linux"
- /sbin/openrc shutdown
-o0:0 m644
-/openrc/type cN oneshot o0:0 m644
-/openrc/up
-CN export TERM "linux"
- foreground { /sbin/openrc boot }
- /sbin/openrc default
-o0:0 m644
-/root-writable d o0:0 m755
-/root-writable/down cN foreground { mount -o remount,ro / } o0:0 m644
-/root-writable/type cN oneshot o0:0 m644
-/root-writable/up cN mount -o remount,rw / o0:0 m644
-/.scripts d o0:0 m755
-/setfont d o0:0 m755
-/setfont/contents
-CN setfont-tty1
- setfont-tty2
- setfont-tty3
- setfont-tty4
-o0:0 m644
-/setfont-tty1 d o0:0 m755
-/setfont-tty1/type cN oneshot o0:0 m644
-/setfont-tty1/up cN redirfd -r 0 /dev/tty1 setfont ter-v14n o0:0 m644
-/setfont-tty2 d o0:0 m755
-/setfont-tty2/type cN oneshot o0:0 m644
-/setfont-tty2/up cN redirfd -r 0 /dev/tty2 setfont ter-v14n o0:0 m644
-/setfont-tty3 d o0:0 m755
-/setfont-tty3/type cN oneshot o0:0 m644
-/setfont-tty3/up cN redirfd -r 0 /dev/tty3 setfont ter-v14n o0:0 m644
-/setfont-tty4 d o0:0 m755
-/setfont-tty4/type cN oneshot o0:0 m644
-/setfont-tty4/up cN redirfd -r 0 /dev/tty4 setfont ter-v14n o0:0 m644
-/setfont/type cN bundle o0:0 m644
-/sshd d o0:0 m755
-/sshd/dependencies
-CN ssh_host_ed25519_key
- ssh_host_rsa_key
- ok-sysinit
-o0:0 m644
-/sshd/run
-CN #!/command/execlineb -P
- fdmove -c 2 1
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/sshd }
- redirfd -w 1 /run/cgroup2/s6-rc/sshd/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- /usr/sbin/sshd -D -f /etc/ssh/sshd_config
-o0:0 m755
-/sshd/type cN longrun o0:0 m644
-/ssh_host_ed25519_key d o0:0 m755
-/ssh_host_ed25519_key/dependencies
-CN hostname
- root-writable
-o0:0 m644
-/ssh_host_ed25519_key/type cN oneshot o0:0 m644
-/ssh_host_ed25519_key/up
-CN if -n -t { s6-test -f /etc/ssh/ssh_host_ed25519_key }
- ssh-keygen -N "" -t ed25519 -f /etc/ssh/ssh_host_ed25519_key
-o0:0 m644
-/ssh_host_rsa_key d o0:0 m755
-/ssh_host_rsa_key/dependencies
-CN hostname
- root-writable
-o0:0 m644
-/ssh_host_rsa_key/type cN oneshot o0:0 m644
-/ssh_host_rsa_key/up
-CN if -n -t { s6-test -f /etc/ssh/ssh_host_rsa_key }
- ssh-keygen -N "" -t rsa -b 4096 -f /etc/ssh/ssh_host_rsa_key
-o0:0 m644
-/swap d o0:0 m755
-/swap/down cN swapoff -a o0:0 m644
-/swap/type cN oneshot o0:0 m644
-/swap/up cN swapon -a o0:0 m644
-/tty1 d o0:0 m755
-/tty1/dependencies cN ok-sysinit o0:0 m644
-/tty1/finish
-CN #!/command/execlineb -P
- redirfd -w 1 /dev/tty1
- fdmove -c 2 1
- foreground { s6-echo "\nwaiting for session cleanup" }
- flock /run/ttylock/tty1 true
-o0:0 m755
-/tty1/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty1 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty1/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- env LOGIN_TTY=/dev/tty1 /sbin/getty 38400 tty1 linux
-o0:0 m755
-/tty1/type cN longrun o0:0 m644
-/tty2 d o0:0 m755
-/tty2/dependencies cN ok-sysinit o0:0 m644
-/tty2/finish
-CN #!/command/execlineb -P
- redirfd -w 1 /dev/tty2
- fdmove -c 2 1
- foreground { s6-echo "\nwaiting for session cleanup" }
- flock /run/ttylock/tty2 true
-o0:0 m755
-/tty2/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty2 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty2/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- env LOGIN_TTY=/dev/tty2 /sbin/getty 38400 tty2 linux
-o0:0 m755
-/tty2/type cN longrun o0:0 m644
-/tty3 d o0:0 m755
-/tty3/dependencies cN ok-sysinit o0:0 m644
-/tty3/finish
-CN #!/command/execlineb -P
- redirfd -w 1 /dev/tty3
- fdmove -c 2 1
- foreground { s6-echo "\nwaiting for session cleanup" }
- flock /run/ttylock/tty3 true
-o0:0 m755
-/tty3/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty3 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty3/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- env LOGIN_TTY=/dev/tty3 /sbin/getty 38400 tty3 linux
-o0:0 m755
-/tty3/type cN longrun o0:0 m644
-/tty4 d o0:0 m755
-/tty4/dependencies cN ok-sysinit o0:0 m644
-/tty4/finish
-CN #!/command/execlineb -P
- redirfd -w 1 /dev/tty4
- fdmove -c 2 1
- foreground { s6-echo "\nwaiting for session cleanup" }
- flock /run/ttylock/tty4 true
-o0:0 m755
-/tty4/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/tty4 }
- redirfd -w 1 /run/cgroup2/s6-rc/tty4/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- env LOGIN_TTY=/dev/tty4 /sbin/getty 38400 tty4 linux
-o0:0 m755
-/tty4/type cN longrun o0:0 m644
-/unbound d o0:0 m755
-/unbound/dependencies
-CN loopback
- ok-mount
- ok-sysinit
-o0:0 m644
-/unbound/run
-CN #!/command/execlineb -P
- getpid SERVICE_PID
- foreground {
- importas -i SERVICE_PID SERVICE_PID
- if { test -d /run/cgroup2 }
- if { mkdir -p /run/cgroup2/s6-rc/unbound }
- redirfd -w 1 /run/cgroup2/s6-rc/unbound/cgroup.procs
- printf "%s" ${SERVICE_PID}
- }
- unexport SERVICE_PID
-
- unbound -d
-o0:0 m755
-/unbound/type cN longrun o0:0 m644
diff --git a/static/etc/fstab b/static/etc/fstab
@@ -5,14 +5,9 @@ devtmpfs /dev devtmpfs rw,nosuid 0 0
devpts /dev/pts devpts rw,relatime,mode=600,ptmxmode=000 0 0
shm /dev/shm tmpfs rw,nosuid,nodev,relatime 0 0
mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec 0 0
-none /run/cgroup2 cgroup2 rw 0 0
-/dev/sda1 /boot ext3 ro,nosuid 0 0
-/dev/mapper/vg-home /home ext4 noatime,nosuid 0 0
-/boot/sysrcd.dat /mnt/sysrcd squashfs ro,loop,nosuid 0 0
-/dev/mmcblk0p1 /mnt/mmc vfat ro,iocharset=utf8 0 0
-/dev/mapper/vg-video /mnt/volumes/video xfs noatime,nosuid 0 0
-/dev/mapper/vg-audio /mnt/volumes/audio xfs noatime,nosuid 0 0
-/dev/mapper/vg-photos /mnt/volumes/photos xfs noatime,nosuid 0 0
-/dev/mapper/vg-syncthing /var/lib/syncthing xfs noatime,nosuid 0 0
+none /run/cgroup cgroup2 rw 0 0
+/dev/sda1 /boot ext4 ro,nosuid 0 0
+/dev/mapper/vg-home /home xfs noatime,nosuid 0 0
+/dev/mmcblk0p1 /mnt/sd f2fs ro,nosuid,nodev 0 0
/dev/mapper/vg-containers /mnt/volumes/containers xfs nosuid,noatime 0 0
/dev/mapper/vg-containers_user /mnt/volumes/containers/user xfs nosuid,noatime 0 0
