commit f2ed66017a8787e4bfdb7ac90a400583fed3c128
parent df45f7aa9d82569524f342f4a30ad5b0e825483e
Author: ccx <root@dorje.wpr.cz>
Date: Fri, 16 Sep 2022 11:18:23 +0200
Update fs from original fstab on carbon
Diffstat:
| M | fs | | | 79 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- |
| M | s6-rc.fileset | | | 181 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------- |
| M | static/etc/fstab | | | 13 | +++++++++++-- |
3 files changed, 226 insertions(+), 47 deletions(-)
diff --git a/fs b/fs
@@ -1,8 +1,7 @@
/
- source=/dev/mapper/vg-spark_root
- #source=LABEL="SPARK_ROOT"
+ source=/dev/mapper/vg-alpine_root
type=xfs
- options=rw,noatime
+ options=noatime,nosuid
premounted=true
down=readonly
bundles=ok-localmount
@@ -49,9 +48,12 @@
bundles=mount-sysinit
down=keep
+# ... managed by s-l-i
#/run
# source=tmpfs
-# ... managed by s-l-i
+# type=tmpfs
+# options=rw,nosuid,nodev,mode=755
+
/run/cgroup2
source=none
@@ -61,12 +63,73 @@
# override dependency on rootfs as /run is always rw
dependencies=
+# ---
+
+
+#/media/cdrom
+# source=/dev/cdrom
+# type=iso9660
+# options=noauto,ro
+#
+#/media/usb
+# source=/dev/usbdisk
+# type=vfat
+# options=noauto,ro
+
+#none
+# source=/dev/mapper/vg-swap
+# type=swap
+# options=defaults
+
/boot
source=/dev/sda1
- #source=LABEL="SPARK_BOOT"
- type=ext2
- options=ro,noatime
- bundles=ok-localmount
+ type=ext3
+ options=ro,nosuid
+
+/home
+ source=/dev/mapper/vg-home
+ type=ext4
+ options=noatime,nosuid
+
+/mnt/sysrcd
+ source=/boot/sysrcd.dat
+ type=squashfs
+ options=ro,loop,nosuid
+
+/mnt/mmc
+ source=/dev/mmcblk0p1
+ type=vfat
+ options=iocharset=utf8
+
+/mnt/volumes/video
+ source=/dev/mapper/vg-video
+ type=xfs
+ options=noatime,nosuid
+
+/mnt/volumes/audio
+ source=/dev/mapper/vg-audio
+ type=xfs
+ options=noatime,nosuid
+
+/mnt/volumes/photos
+ source=/dev/mapper/vg-photos
+ type=xfs
+ options=noatime,nosuid
+
+/var/lib/syncthing
+ source=/dev/mapper/vg-syncthing
+ type=xfs
+ options=noatime,nosuid
+
+/mnt/volumes/containers
+ source=/dev/mapper/vg-containers
+ type=xfs
+ options=nosuid,noatime
+
+/mnt/volumes/containers/user
+ source=/dev/mapper/vg-containers_user
+ type=xfs
+ options=nosuid,noatime
#/dev/mapper/vg-swap none swap defaults 0 0
diff --git a/s6-rc.fileset b/s6-rc.fileset
@@ -2,9 +2,9 @@
/rootfs/down cN mount -o remount,ro "/" m644
/rootfs/type cN oneshot m644
/rootfs/up
-CN # mount /dev/mapper/vg-spark_root on /
- if -n -t { mount -t "xfs" -o "remount,rw,noatime" "/dev/mapper/vg-spark_root" "/" }
- mount -t "xfs" -o "rw,noatime" "/dev/mapper/vg-spark_root" "/"
+CN # mount /dev/mapper/vg-alpine_root on /
+ if -n -t { mount -t "xfs" -o "remount,noatime,nosuid" "/dev/mapper/vg-alpine_root" "/" }
+ mount -t "xfs" -o "noatime,nosuid" "/dev/mapper/vg-alpine_root" "/"
/mount-sys d m755
/mount-sys/dependencies
CN rootfs
@@ -89,8 +89,122 @@ m644
/mount-boot/up
CN # mount /dev/sda1 on /boot
if { mkdir -p "/boot" }
- if -n -t { mount -t "ext2" -o "remount,ro,noatime" "/dev/sda1" "/boot" }
- mount -t "ext2" -o "ro,noatime" "/dev/sda1" "/boot"
+ if -n -t { mount -t "ext3" -o "remount,ro,nosuid" "/dev/sda1" "/boot" }
+ mount -t "ext3" -o "ro,nosuid" "/dev/sda1" "/boot"
+/mount-home d m755
+/mount-home/dependencies
+CN rootfs
+
+m644
+/mount-home/down cN s6-umount "/home" m644
+/mount-home/type cN oneshot 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/dependencies
+CN rootfs
+
+m644
+/mount-mnt-sysrcd/down cN s6-umount "/mnt/sysrcd" m644
+/mount-mnt-sysrcd/type cN oneshot 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/dependencies
+CN rootfs
+
+m644
+/mount-mnt-mmc/down cN s6-umount "/mnt/mmc" m644
+/mount-mnt-mmc/type cN oneshot 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,iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc" }
+ mount -t "vfat" -o "iocharset=utf8" "/dev/mmcblk0p1" "/mnt/mmc"
+/mount-mnt-volumes-video d m755
+/mount-mnt-volumes-video/dependencies
+CN rootfs
+
+m644
+/mount-mnt-volumes-video/down cN s6-umount "/mnt/volumes/video" m644
+/mount-mnt-volumes-video/type cN oneshot 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/dependencies
+CN rootfs
+
+m644
+/mount-mnt-volumes-audio/down cN s6-umount "/mnt/volumes/audio" m644
+/mount-mnt-volumes-audio/type cN oneshot 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/dependencies
+CN rootfs
+
+m644
+/mount-mnt-volumes-photos/down cN s6-umount "/mnt/volumes/photos" m644
+/mount-mnt-volumes-photos/type cN oneshot 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/dependencies
+CN rootfs
+
+m644
+/mount-var-lib-syncthing/down cN s6-umount "/var/lib/syncthing" m644
+/mount-var-lib-syncthing/type cN oneshot 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-volumes-containers d m755
+/mount-mnt-volumes-containers/dependencies
+CN rootfs
+
+m644
+/mount-mnt-volumes-containers/down cN s6-umount "/mnt/volumes/containers" m644
+/mount-mnt-volumes-containers/type cN oneshot m644
+/mount-mnt-volumes-containers/up
+CN # mount /dev/mapper/vg-containers on /mnt/volumes/containers
+ if { mkdir -p "/mnt/volumes/containers" }
+ if -n -t { mount -t "xfs" -o "remount,nosuid,noatime" "/dev/mapper/vg-containers" "/mnt/volumes/containers" }
+ mount -t "xfs" -o "nosuid,noatime" "/dev/mapper/vg-containers" "/mnt/volumes/containers"
+/mount-mnt-volumes-containers-user d m755
+/mount-mnt-volumes-containers-user/dependencies
+CN mount-mnt-volumes-containers
+
+m644
+/mount-mnt-volumes-containers-user/down cN s6-umount "/mnt/volumes/containers/user" m644
+/mount-mnt-volumes-containers-user/type cN oneshot m644
+/mount-mnt-volumes-containers-user/up
+CN # mount /dev/mapper/vg-containers_user on /mnt/volumes/containers/user
+ if { mkdir -p "/mnt/volumes/containers/user" }
+ if -n -t { mount -t "xfs" -o "remount,nosuid,noatime" "/dev/mapper/vg-containers_user" "/mnt/volumes/containers/user" }
+ mount -t "xfs" -o "nosuid,noatime" "/dev/mapper/vg-containers_user" "/mnt/volumes/containers/user"
+/ok-localmount d m755
+/ok-localmount/contents
+CN rootfs
+
+m644
+/ok-localmount/type cN bundle m644
/mount-sysinit d m755
/mount-sysinit/contents
CN mount-sys
@@ -103,13 +217,6 @@ CN mount-sys
m644
/mount-sysinit/type cN bundle m644
-/ok-localmount d m755
-/ok-localmount/contents
-CN rootfs
- mount-boot
-
-m644
-/ok-localmount/type cN bundle m644
/ d m755
/ok-all d m755
@@ -171,7 +278,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
dhcpcd --nobackground
m755
@@ -193,7 +300,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
unbound -d
m755
@@ -231,7 +338,7 @@ CN #!/command/execlineb -P
}
unexport SERVICE_PID
foreground { /command/issue-gen }
-
+
env LOGIN_TTY=/dev/tty1 /sbin/getty -l login-keepenv 38400 tty1 linux
m755
/tty1/finish
@@ -256,7 +363,7 @@ CN #!/command/execlineb -P
}
unexport SERVICE_PID
foreground { /command/issue-gen }
-
+
env LOGIN_TTY=/dev/tty2 /sbin/getty -l login-keepenv 38400 tty2 linux
m755
/tty2/finish
@@ -281,7 +388,7 @@ CN #!/command/execlineb -P
}
unexport SERVICE_PID
foreground { /command/issue-gen }
-
+
env LOGIN_TTY=/dev/tty3 /sbin/getty -l login-keepenv 38400 tty3 linux
m755
/tty3/finish
@@ -306,7 +413,7 @@ CN #!/command/execlineb -P
}
unexport SERVICE_PID
foreground { /command/issue-gen }
-
+
env LOGIN_TTY=/dev/tty4 /sbin/getty -l login-keepenv 38400 tty4 linux
m755
/tty4/finish
@@ -415,7 +522,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
background {
sh -xc "until /sbin/udevadm settle --timeout=120; do sleep 0.5; done; echo >&3 settled"
#foreground { loopwhilex -x 0 if -nt { /sbin/udevadm settle --timeout=120 } foreground { sleep 0.1 } exit 1 }
@@ -473,7 +580,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
/usr/sbin/sshd -D -f /etc/ssh/sshd_config
m755
@@ -534,7 +641,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
alsactl rdaemon
m750
/alsactl-rdaemon/type cN longrun m640
@@ -573,7 +680,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
if { mkdir -p /run/user/ccx.logs }
if { chown ccx: /run/user/ccx.logs }
if { chmod 700 /run/user/ccx.logs }
@@ -596,7 +703,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
if { mkdir -p /run/user/ccx }
if { chown ccx: /run/user/ccx }
if { chmod 700 /run/user/ccx }
@@ -619,7 +726,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
if { mkdir -p /var/log/syncthing }
s6-log -b -- n10 s10240000 t /var/log/syncthing
m750
@@ -637,7 +744,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
/usr/bin/env HOME=/var/lib/syncthing
s6-setuidgid syncthing
syncthing -logflags 0
@@ -659,7 +766,7 @@ CN #!/command/execlineb -P
printf "%s" ${SERVICE_PID}
}
unexport SERVICE_PID
-
+
/sbin/wpa_supplicant
-iwlan0
-c/etc/wpa_supplicant/wpa_supplicant.conf
@@ -763,9 +870,19 @@ CN #!/command/execlineb -P
-retro
-novtswitch
vt${vtN} :${vtN}
-
+
m755
+/setfont d m755
+/setfont/type cN bundle m644
+/setfont/contents
+C setfont-tty1
+ setfont-tty2
+ setfont-tty3
+ setfont-tty4
+
+m644
+
/ok-all-but-tty d m755
/ok-all-but-tty/type cN bundle m644
/ok-all-but-tty/contents
@@ -786,16 +903,6 @@ C net-all
m644
-/setfont d m755
-/setfont/type cN bundle m644
-/setfont/contents
-C setfont-tty1
- setfont-tty2
- setfont-tty3
- setfont-tty4
-
-m644
-
/net-all d m755
/net-all/type cN bundle m644
/net-all/contents
diff --git a/static/etc/fstab b/static/etc/fstab
@@ -1,4 +1,4 @@
-/dev/mapper/vg-spark_root / xfs rw,noatime 0 0
+/dev/mapper/vg-alpine_root / xfs noatime,nosuid 0 0
sysfs /sys sysfs rw 0 0
proc /proc proc rw 0 0
devtmpfs /dev devtmpfs rw,nosuid 0 0
@@ -6,4 +6,13 @@ 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 ext2 ro,noatime 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 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
+/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
