1 files changed, 22 insertions, 70 deletions
diff --git a/examples/devfsd.conf b/examples/devfsd.conf
index ea7334374..e90e7102b 100644
--- a/examples/devfsd.conf
+++ b/examples/devfsd.conf
@@ -25,11 +25,10 @@ UNREGISTER	.*		RMNEWCOMPAT
 # Enable module autoloading. You may comment this out if you don't use
 # autoloading
-# Not supported by busybox
+# Supported by busybox when CONFIG_DEVFSD_MODLOAD is set.
-#LOOKUP         .*              MODLOAD
+# This actually doesn't work with busybox  modutils but needs
-# Maybe one of these works for busybox
+# the real modutils' modprobe
-#LOOKUP         .*              EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs *
+LOOKUP          .*              MODLOAD
-#REGISTER       .*              EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs *
 # Uncomment the following if you want to set the group to "tty" for the
 # pseudo-tty devices. This is necessary so that mesg(1) can later be used to
@@ -68,7 +67,6 @@ RESTORE		/lib/dev-state
 REGISTER        ^cdroms/cdrom0$ EXECUTE /bin/ln -sf $devname cdrom
 UNREGISTER      ^cdroms/cdrom0$ EXECUTE /bin/rm -f cdrom
 #REGISTER       ^v4l/video0$    CFUNCTION GLOBAL mksymlink v4l/video0 video
 #UNREGISTER     ^v4l/video0$    CFUNCTION GLOBAL unlink video
 #REGISTER       ^radio0$        CFUNCTION GLOBAL mksymlink radio0 radio
@@ -80,18 +78,23 @@ REGISTER	^radio0$		EXECUTE /bin/ln -sf  radio0 radio
 UNREGISTER      ^radio0$                EXECUTE /bin/rm -f radio
 # ALSA stuff
-# Not supported by busybox
 #LOOKUP                 snd             MODLOAD ACTION snd
-# Maybe this works for busybox
-#LOOKUP                 snd             EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs snd
 # Uncomment this to let PAM manage devfs
+# Not supported by busybox
 #REGISTER       .*              CFUNCTION /lib/security/pam_console_apply_devfsd.so pam_console_apply_single $devpath
 # Uncomment this to manage USB mouse
+# Not supported by busybox
 #REGISTER       ^input/mouse0$  CFUNCTION GLOBAL mksymlink $devname usbmouse
 #UNREGISTER     ^input/mouse0$  CFUNCTION GLOBAL unlink usbmouse
 # Busybox
+#REGISTER       ^input/mouse0$  EXECUTE /bin/ln -sf $devname usbmouse
+#UNREGISTER     ^input/mouse0$  EXECUTE /bin/rm -f usbmouse
+# Not supported by busybox
+#REGISTER       ^input/mice$    CFUNCTION GLOBAL mksymlink $devname usbmouse
+#UNREGISTER     ^input/mice$    CFUNCTION GLOBAL unlink usbmouse
+# Busybox
 REGISTER        ^input/mice$    EXECUTE /bin/ln -sf $devname usbmouse
 UNREGISTER      ^input/mice$    EXECUTE /bin/rm -f usbmouse
@@ -107,75 +110,24 @@ LOOKUP		^(ide/hd/c[0-9]+b[0-9]+t[0-9]+u[0-9]+)p[0-9]+$	EXECUTE /bin/dd if=$mntpn
 LOOKUP          ^(hd[a-z])[0-9]+$       EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
 # IDE-SCSI NEWCOMPAT  /dev/sd/* names
 #LOOKUP         ^(sd/c[0-9]+b[0-9]+t[0-9]+u[0-9]+)p[0-9]+$      EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
-# SCSI OLDCOMPAT  /dev/scd? names
+#SCSI OLDCOMPAT  /dev/scd? names
 LOOKUP          ^(scd+)[0-9]+$  EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
 REGISTER ^dvb/card[0-9]+/[^/]+$ PERMISSIONS root.video 0660
-# Busybox
+# Not supported by busybox
 #REGISTER       ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$     CFUNCTION GLOBAL mksymlink /dev/$devname ost/\2\1
 #UNREGISTER     ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$     CFUNCTION GLOBAL unlink ost/\2\1
+# Busybox
 REGISTER        ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$     EXECUTE /bin/ln -sf /dev/$devname ost/\2\1
 UNREGISTER      ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$     EXECUTE /bin/rm -f ost/\2\1
 # Include package-generated files from /etc/devfs/conf.d
 # Supported by busybox
-#OPTIONAL_INCLUDE   /etc/devfs/conf.d/dvd.conf
+# INCLUDE   /etc/devfs/conf.d/
-#INCLUDE   /etc/devfs/conf.d/dvd.conf
+INCLUDE   /etc/devfs/busybox/
-#OPTIONAL_INCLUDE   /etc/devfs/conf.d/
+# Busybox: just for testing
-#INCLUDE   /etc/devfs/conf.d/
+#INCLUDE                        /etc/devfs/nothing/
+#INCLUDE                        /etc/devfs/nothing/nothing
-#/etc/devfs/conf.d/dvd.conf
+#OPTIONAL_INCLUDE       /etc/devfs/nothing/
-#REGISTER       ^ide/host0/bus1/target1/lun0/cd$        CFUNCTION GLOBAL mksymlink ide/host0/bus1/target1/lun0/cd dvd
+#OPTIONAL_INCLUDE       /etc/devfs/nothing/nothing
-#UNREGISTER     ^ide/host0/bus1/target1/lun0/cd$        CFUNCTION GLOBAL unlink dvd
-REGISTER        ^ide/host0/bus1/target1/lun0/cd$        EXECUTE ln -sf ide/host0/bus1/target1/lun0/cd dvd
-UNREGISTER      ^ide/host0/bus1/target1/lun0/cd$        EXECUTE rm -f dvd
-#/etc/devfs/conf.d/dynamic.conf
-# dynamic desktop and co
-REGISTER        .*/part.*       EXECUTE /etc/dynamic/scripts/part.script add $devpath
-UNREGISTER      .*/part.*       EXECUTE /etc/dynamic/scripts/part.script del $devpath
-REGISTER        v4l/video.*     EXECUTE /etc/dynamic/scripts/webcam.script add $devpath
-UNREGISTER      v4l/video.*     EXECUTE /etc/dynamic/scripts/webcam.script del $devpath
-REGISTER        usb/scanner.*   EXECUTE /etc/dynamic/scripts/scanner.script add $devpath
-UNREGISTER      usb/scanner.*   EXECUTE /etc/dynamic/scripts/scanner.script del $devpath
-REGISTER        usb/rio500      EXECUTE /etc/dynamic/scripts/rio500.script add $devpath
-UNREGISTER      usb/rio500      EXECUTE /etc/dynamic/scripts/rio500.script del $devpath
-REGISTER        usb/tts/[13579] EXECUTE /etc/dynamic/scripts/visor.script add $devpath
-UNREGISTER      usb/tts/[13579] EXECUTE /etc/dynamic/scripts/visor.script del $devpath
-REGISTER        (usb/lp.*|printers/.*)  EXECUTE /etc/dynamic/scripts/lp.script add $devpath
-UNREGISTER      (usb/lp.*|printers/.*)  EXECUTE /etc/dynamic/scripts/lp.script del $devpath
-#/etc/devfs/conf.d/modem.conf
-#REGISTER       ^$      CFUNCTION GLOBAL mksymlink  modem
-#UNREGISTER     ^$      CFUNCTION GLOBAL unlink modem
-REGISTER        ^tts/0$ EXECUTE ln -sf  $devname modem
-UNREGISTER      ^$      EXECUTE rm -f modem
-#/etc/devfs/conf.d/mouse.conf
-#REGISTER       ^misc/psaux$    CFUNCTION GLOBAL mksymlink misc/psaux mouse
-#UNREGISTER     ^misc/psaux$    CFUNCTION GLOBAL unlink mouse
-REGISTER        ^misc/psaux$    EXECUTE ln -sf misc/psaux mouse
-UNREGISTER      ^misc/psaux$    EXECUTE rm -f mouse
-#/etc/devfs/conf.d/psaux.conf
-#REGISTER       ^misc/psaux$    CFUNCTION GLOBAL mksymlink misc/psaux psaux
-#UNREGISTER     ^misc/psaux$    CFUNCTION GLOBAL unlink psaux
-REGISTER        ^misc/psaux$    EXECUTE ln -sf misc/psaux psaux
-UNREGISTER      ^misc/psaux$    EXECUTE rm -f psaux
-#/etc/devfs/conf.d/rdvd.conf
-REGISTER        ^ide/host0/bus1/target1/lun0/cd$        EXECUTE /etc/dynamic/scripts/rawdevice.script add /dev/ide/host0/bus1/target1/lun0/cd /dev/rdvd
-UNREGISTER      ^ide/host0/bus1/target1/lun0/cd$        EXECUTE /etc/dynamic/scripts/rawdevice.script del /dev/rdvd
-#/etc/devfs/conf.d/ttyS0.conf
-#REGISTER       ^tts/0$ CFUNCTION GLOBAL mksymlink tts/0 ttyS0
-#UNREGISTER     ^tts/0$ CFUNCTION GLOBAL unlink ttyS0
-REGISTER        ^tts/0$ EXECUTE ln -sf $devname ttyS0
-UNREGISTER      ^tts/0$ EXECUTE rm -f ttyS0

diff --git a/examples/devfsd.conf b/examples/devfsd.conf index ea7334374..e90e7102b 100644 --- a/examples/devfsd.conf +++ b/examples/devfsd.conf
@@ -25,11 +25,10 @@ UNREGISTER .* RMNEWCOMPAT
25		25
26	# Enable module autoloading. You may comment this out if you don't use	26	# Enable module autoloading. You may comment this out if you don't use
27	# autoloading	27	# autoloading
28	# Not supported by busybox	28	# Supported by busybox when CONFIG_DEVFSD_MODLOAD is set.
29	#LOOKUP .* MODLOAD	29	# This actually doesn't work with busybox modutils but needs
30	# Maybe one of these works for busybox	30	# the real modutils' modprobe
31	#LOOKUP .* EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs *	31	LOOKUP .* MODLOAD
32	#REGISTER .* EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs *
33		32
34	# Uncomment the following if you want to set the group to "tty" for the	33	# Uncomment the following if you want to set the group to "tty" for the
35	# pseudo-tty devices. This is necessary so that mesg(1) can later be used to	34	# pseudo-tty devices. This is necessary so that mesg(1) can later be used to
@@ -68,7 +67,6 @@ RESTORE /lib/dev-state
68	REGISTER ^cdroms/cdrom0$ EXECUTE /bin/ln -sf $devname cdrom	67	REGISTER ^cdroms/cdrom0$ EXECUTE /bin/ln -sf $devname cdrom
69	UNREGISTER ^cdroms/cdrom0$ EXECUTE /bin/rm -f cdrom	68	UNREGISTER ^cdroms/cdrom0$ EXECUTE /bin/rm -f cdrom
70		69
71
72	#REGISTER ^v4l/video0$ CFUNCTION GLOBAL mksymlink v4l/video0 video	70	#REGISTER ^v4l/video0$ CFUNCTION GLOBAL mksymlink v4l/video0 video
73	#UNREGISTER ^v4l/video0$ CFUNCTION GLOBAL unlink video	71	#UNREGISTER ^v4l/video0$ CFUNCTION GLOBAL unlink video
74	#REGISTER ^radio0$ CFUNCTION GLOBAL mksymlink radio0 radio	72	#REGISTER ^radio0$ CFUNCTION GLOBAL mksymlink radio0 radio
@@ -80,18 +78,23 @@ REGISTER ^radio0$ EXECUTE /bin/ln -sf radio0 radio
80	UNREGISTER ^radio0$ EXECUTE /bin/rm -f radio	78	UNREGISTER ^radio0$ EXECUTE /bin/rm -f radio
81		79
82	# ALSA stuff	80	# ALSA stuff
83	# Not supported by busybox
84	#LOOKUP snd MODLOAD ACTION snd	81	#LOOKUP snd MODLOAD ACTION snd
85	# Maybe this works for busybox
86	#LOOKUP snd EXECUTE /sbin/modprobe -k -v -C /etc/modules.devfs snd
87		82
88	# Uncomment this to let PAM manage devfs	83	# Uncomment this to let PAM manage devfs
		84	# Not supported by busybox
89	#REGISTER .* CFUNCTION /lib/security/pam_console_apply_devfsd.so pam_console_apply_single $devpath	85	#REGISTER .* CFUNCTION /lib/security/pam_console_apply_devfsd.so pam_console_apply_single $devpath
90		86
91	# Uncomment this to manage USB mouse	87	# Uncomment this to manage USB mouse
		88	# Not supported by busybox
92	#REGISTER ^input/mouse0$ CFUNCTION GLOBAL mksymlink $devname usbmouse	89	#REGISTER ^input/mouse0$ CFUNCTION GLOBAL mksymlink $devname usbmouse
93	#UNREGISTER ^input/mouse0$ CFUNCTION GLOBAL unlink usbmouse	90	#UNREGISTER ^input/mouse0$ CFUNCTION GLOBAL unlink usbmouse
94	# Busybox	91	# Busybox
		92	#REGISTER ^input/mouse0$ EXECUTE /bin/ln -sf $devname usbmouse
		93	#UNREGISTER ^input/mouse0$ EXECUTE /bin/rm -f usbmouse
		94	# Not supported by busybox
		95	#REGISTER ^input/mice$ CFUNCTION GLOBAL mksymlink $devname usbmouse
		96	#UNREGISTER ^input/mice$ CFUNCTION GLOBAL unlink usbmouse
		97	# Busybox
95	REGISTER ^input/mice$ EXECUTE /bin/ln -sf $devname usbmouse	98	REGISTER ^input/mice$ EXECUTE /bin/ln -sf $devname usbmouse
96	UNREGISTER ^input/mice$ EXECUTE /bin/rm -f usbmouse	99	UNREGISTER ^input/mice$ EXECUTE /bin/rm -f usbmouse
97		100
@@ -107,75 +110,24 @@ LOOKUP ^(ide/hd/c[0-9]+b[0-9]+t[0-9]+u[0-9]+)p[0-9]+$ EXECUTE /bin/dd if=$mntpn
107	LOOKUP ^(hd[a-z])[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1	110	LOOKUP ^(hd[a-z])[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
108	# IDE-SCSI NEWCOMPAT /dev/sd/* names	111	# IDE-SCSI NEWCOMPAT /dev/sd/* names
109	#LOOKUP ^(sd/c[0-9]+b[0-9]+t[0-9]+u[0-9]+)p[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1	112	#LOOKUP ^(sd/c[0-9]+b[0-9]+t[0-9]+u[0-9]+)p[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
110	# SCSI OLDCOMPAT /dev/scd? names	113	#SCSI OLDCOMPAT /dev/scd? names
111	LOOKUP ^(scd+)[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1	114	LOOKUP ^(scd+)[0-9]+$ EXECUTE /bin/dd if=$mntpnt/\1 of=/dev/null count=1
112		115
113		116
114	REGISTER ^dvb/card[0-9]+/[^/]+$ PERMISSIONS root.video 0660	117	REGISTER ^dvb/card[0-9]+/[^/]+$ PERMISSIONS root.video 0660
115	# Busybox	118	# Not supported by busybox
116	#REGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ CFUNCTION GLOBAL mksymlink /dev/$devname ost/\2\1	119	#REGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ CFUNCTION GLOBAL mksymlink /dev/$devname ost/\2\1
117	#UNREGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ CFUNCTION GLOBAL unlink ost/\2\1	120	#UNREGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ CFUNCTION GLOBAL unlink ost/\2\1
		121	# Busybox
118	REGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ EXECUTE /bin/ln -sf /dev/$devname ost/\2\1	122	REGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ EXECUTE /bin/ln -sf /dev/$devname ost/\2\1
119	UNREGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ EXECUTE /bin/rm -f ost/\2\1	123	UNREGISTER ^dvb/card([0-9]+)/([^/0-9]*)[0-9]+$ EXECUTE /bin/rm -f ost/\2\1
120		124
121	# Include package-generated files from /etc/devfs/conf.d	125	# Include package-generated files from /etc/devfs/conf.d
122	# Supported by busybox	126	# Supported by busybox
123	#OPTIONAL_INCLUDE /etc/devfs/conf.d/dvd.conf	127	# INCLUDE /etc/devfs/conf.d/
124	#INCLUDE /etc/devfs/conf.d/dvd.conf	128	INCLUDE /etc/devfs/busybox/
125	#OPTIONAL_INCLUDE /etc/devfs/conf.d/	129	# Busybox: just for testing
126	#INCLUDE /etc/devfs/conf.d/	130	#INCLUDE /etc/devfs/nothing/
127		131	#INCLUDE /etc/devfs/nothing/nothing
128	#/etc/devfs/conf.d/dvd.conf	132	#OPTIONAL_INCLUDE /etc/devfs/nothing/
129	#REGISTER ^ide/host0/bus1/target1/lun0/cd$ CFUNCTION GLOBAL mksymlink ide/host0/bus1/target1/lun0/cd dvd	133	#OPTIONAL_INCLUDE /etc/devfs/nothing/nothing
130	#UNREGISTER ^ide/host0/bus1/target1/lun0/cd$ CFUNCTION GLOBAL unlink dvd
131	REGISTER ^ide/host0/bus1/target1/lun0/cd$ EXECUTE ln -sf ide/host0/bus1/target1/lun0/cd dvd
132	UNREGISTER ^ide/host0/bus1/target1/lun0/cd$ EXECUTE rm -f dvd
133
134	#/etc/devfs/conf.d/dynamic.conf
135	# dynamic desktop and co
136
137	REGISTER ./part. EXECUTE /etc/dynamic/scripts/part.script add $devpath
138	UNREGISTER ./part. EXECUTE /etc/dynamic/scripts/part.script del $devpath
139
140	REGISTER v4l/video.* EXECUTE /etc/dynamic/scripts/webcam.script add $devpath
141	UNREGISTER v4l/video.* EXECUTE /etc/dynamic/scripts/webcam.script del $devpath
142
143	REGISTER usb/scanner.* EXECUTE /etc/dynamic/scripts/scanner.script add $devpath
144	UNREGISTER usb/scanner.* EXECUTE /etc/dynamic/scripts/scanner.script del $devpath
145
146	REGISTER usb/rio500 EXECUTE /etc/dynamic/scripts/rio500.script add $devpath
147	UNREGISTER usb/rio500 EXECUTE /etc/dynamic/scripts/rio500.script del $devpath
148
149	REGISTER usb/tts/[13579] EXECUTE /etc/dynamic/scripts/visor.script add $devpath
150	UNREGISTER usb/tts/[13579] EXECUTE /etc/dynamic/scripts/visor.script del $devpath
151
152	REGISTER (usb/lp.\|printers/.) EXECUTE /etc/dynamic/scripts/lp.script add $devpath
153	UNREGISTER (usb/lp.\|printers/.) EXECUTE /etc/dynamic/scripts/lp.script del $devpath
154
155	#/etc/devfs/conf.d/modem.conf
156	#REGISTER ^$ CFUNCTION GLOBAL mksymlink modem
157	#UNREGISTER ^$ CFUNCTION GLOBAL unlink modem
158	REGISTER ^tts/0$ EXECUTE ln -sf $devname modem
159	UNREGISTER ^$ EXECUTE rm -f modem
160
161	#/etc/devfs/conf.d/mouse.conf
162	#REGISTER ^misc/psaux$ CFUNCTION GLOBAL mksymlink misc/psaux mouse
163	#UNREGISTER ^misc/psaux$ CFUNCTION GLOBAL unlink mouse
164	REGISTER ^misc/psaux$ EXECUTE ln -sf misc/psaux mouse
165	UNREGISTER ^misc/psaux$ EXECUTE rm -f mouse
166
167	#/etc/devfs/conf.d/psaux.conf
168	#REGISTER ^misc/psaux$ CFUNCTION GLOBAL mksymlink misc/psaux psaux
169	#UNREGISTER ^misc/psaux$ CFUNCTION GLOBAL unlink psaux
170	REGISTER ^misc/psaux$ EXECUTE ln -sf misc/psaux psaux
171	UNREGISTER ^misc/psaux$ EXECUTE rm -f psaux
172
173	#/etc/devfs/conf.d/rdvd.conf
174	REGISTER ^ide/host0/bus1/target1/lun0/cd$ EXECUTE /etc/dynamic/scripts/rawdevice.script add /dev/ide/host0/bus1/target1/lun0/cd /dev/rdvd
175	UNREGISTER ^ide/host0/bus1/target1/lun0/cd$ EXECUTE /etc/dynamic/scripts/rawdevice.script del /dev/rdvd
176
177	#/etc/devfs/conf.d/ttyS0.conf
178	#REGISTER ^tts/0$ CFUNCTION GLOBAL mksymlink tts/0 ttyS0
179	#UNREGISTER ^tts/0$ CFUNCTION GLOBAL unlink ttyS0
180	REGISTER ^tts/0$ EXECUTE ln -sf $devname ttyS0
181	UNREGISTER ^tts/0$ EXECUTE rm -f ttyS0