mrrl-system-config

commit 521f9e90bebc0bb53e6d781daf2f7ec7dc42b84d
parent aa6e56d2a3e1cf0d53d70db8348c35272e876677
Author: ccx <ccx@te2000.cz>
Date:   Fri,  8 Mar 2024 19:01:04 +0000

Use dedicated environment for mdevd

Diffstat:
M
config/mdevd.conf
 | 
22
+++++++++++-----------
M
s6-rc.aat
 | 
11
+++++------
M
version_path.awk
 | 
8
++++++++

3 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/config/mdevd.conf b/config/mdevd.conf
@@ -38,14 +38,14 @@ ram([0-9]*)	root:disk 0660 >rd/%1
 loop([0-9]+)	root:disk 0660 >loop/%1
 
 # persistent storage
-dasd.*		root:disk 0660 */lib/mdev/persistent-storage
-mmcblk.*	root:disk 0660 */lib/mdev/persistent-storage
-nbd.*		root:disk 0660 */lib/mdev/persistent-storage
-nvme.*		root:disk 0660 */lib/mdev/persistent-storage
-sd[a-z].*	root:disk 0660 */lib/mdev/persistent-storage
-sr[0-9]+	root:cdrom 0660 */lib/mdev/persistent-storage
-vd[a-z].*	root:disk 0660 */lib/mdev/persistent-storage
-xvd[a-z].*	root:disk 0660 */lib/mdev/persistent-storage
+dasd.*		root:disk 0660 *mdev-hook-persistent-storage
+mmcblk.*	root:disk 0660 *mdev-hook-persistent-storage
+nbd.*		root:disk 0660 *mdev-hook-persistent-storage
+nvme.*		root:disk 0660 *mdev-hook-persistent-storage
+sd[a-z].*	root:disk 0660 *mdev-hook-persistent-storage
+sr[0-9]+	root:cdrom 0660 *mdev-hook-persistent-storage
+vd[a-z].*	root:disk 0660 *mdev-hook-persistent-storage
+xvd[a-z].*	root:disk 0660 *mdev-hook-persistent-storage
 
 md[0-9]		root:disk 0660
 
@@ -88,7 +88,7 @@ sequencer.*	root:audio 0660 >sound/
 SUBSYSTEM=sound;.*	root:audio 0660
 
 # PTP devices
-ptp[0-9]	root:root 0660 */lib/mdev/ptpdev
+ptp[0-9]	root:root 0660 *mdev-hook-ptpdev
 
 # virtio-ports
 SUBSYSTEM=virtio-ports;vport.* root:root 0600 @mkdir -p virtio-ports; ln -sf ../$MDEV virtio-ports/$(cat /sys/class/virtio-ports/$MDEV/name)
@@ -110,10 +110,10 @@ vbi[0-9]	root:video 0660 >v4l/
 video[0-9]+	root:video 0660 >v4l/
 
 # dvb stuff
-dvb.*		root:video 0660 */lib/mdev/dvbdev
+dvb.*		root:video 0660 *mdev-hook-dvbdev
 
 # load drivers for usb devices
-usb[0-9]+	root:root 0660 */lib/mdev/usbdev
+usb[0-9]+	root:root 0660 *mdev-hook-usbdev
 
 # net devices
 # 666 is fine: https://www.kernel.org/doc/Documentation/networking/tuntap.txt
diff --git a/s6-rc.aat b/s6-rc.aat
@@ -135,7 +135,7 @@
 
 |start_oneshot("mdevd-coldplug", "mount-dev mount-sys modules mdevd")
 |up()
-	{{qexec("mdevd-coldplug")}}
+	{{qenv("mdevd"}} mdevd-coldplug
 |end()
 
 |start_oneshot("udev-coldplug", "mount-dev mount-sys modules udev")
@@ -150,9 +150,9 @@
 
 |start_longrun("mdevd", "mount-dev")  # TODO add "mount-proc mount-sys", add logger
 |notification_fd(3)
-|run()  # TODO use run_el() or run_arg()
-	#!{{exec_path("execlineb")}} -P
-	{{qexec("mdevd")}} -D 3 -f {{qconfig("mdevd.conf")}}
+|run()
+	#!{{env_el("mdevd")}} -P
+	mdevd -D 3 -f {{qconfig("mdevd.conf")}}
 |end()
 
 |start_longrun("udev", "mount-sys mount-proc mount-dev")  # TODO add logger
@@ -328,8 +328,7 @@
 |if(find("X_servers.rows")) {
 /.scripts	d	m755
 /.scripts/X.run
-CN	#!{{exec_path("execlineb")}} -P
-	{{qenv("containers")}}
+CN	#!{{env_el("containers")}} -P
 	fdmove -c 2 1
 	s6-envdir env
 	importas vtN vtN
diff --git a/version_path.awk b/version_path.awk
@@ -41,3 +41,11 @@ function env_enter(name) {
 function qenv(s) {
 	return q(env_enter(s))
 }
+
+function env_el(s) {
+	return env_enter(s)"-execlineb"
+}
+
+function env_sh(s) {
+	return env_enter(s)"-sh"
+}