diff options
author | Christoph Lohmann <20h@r-36.net> | 2012-05-28 13:55:58 +0200 |
---|---|---|
committer | Christoph Lohmann <20h@r-36.net> | 2012-05-28 13:55:58 +0200 |
commit | 0ae13c5543d925768153f7356ca216330d24a0fd (patch) | |
tree | 8e82f53451a5ae0e6e6f025b53b64b1ac496a180 /mdev | |
parent | db64d569025530b743e4d2140fc10e0431ae0815 (diff) | |
download | nldev-0ae13c5543d925768153f7356ca216330d24a0fd.tar.bz2 nldev-0ae13c5543d925768153f7356ca216330d24a0fd.tar.xz |
Preliminary fixes for the new mdev in busybox.
Diffstat (limited to 'mdev')
-rw-r--r-- | mdev/etc/mdev.conf | 36 | ||||
-rwxr-xr-x | mdev/lib/inputdev | 14 |
2 files changed, 23 insertions, 27 deletions
diff --git a/mdev/etc/mdev.conf b/mdev/etc/mdev.conf index b7267ec..062b4d8 100644 --- a/mdev/etc/mdev.conf +++ b/mdev/etc/mdev.conf @@ -52,12 +52,9 @@ port root:kmem 640 nvram root:kmem 640 # input -mouse.* root:root 640 =input/ -mice root:root 640 =input/ -event.* root:root 640 */lib/mdev/inputdev -ts[0-9]* root:root 640 =input/ -uinput root:root 640$ =input/ -js[0-9]* root:root 644 =input/ +input/event[0-9]* root:root 640 */lib/mdev/inputdev +input/js[0-9]* root:root 644 +input/.* root:root 640 # v4l vttuner.* root:video 660 >v4l/ @@ -79,10 +76,10 @@ card[0-9]* root:video 660 =dri/ controlD[0-9]* root:video 660 =dri/ # dvb -dvb.* root:video 660 */lib/mdev/dvbdev +dvb.* root:video 660 */lib/mdev/dvbdev # usb -([0-9]+)-([0-9]+).* root:usb 665 */lib/mdev/usb +bus/usb/.* root:usb 665 */lib/mdev/usb # printer parport[0-9]* root:lp 660 @@ -142,20 +139,15 @@ aoe.* root:disk 660 =etherd/ bsg/.* root:disk 660 =bsg/ # audio -pcmC.* root:audio 660 =snd/ -controlC.* root:audio 660 =snd/ -midiC.* root:audio 660 =snd/ -seq root:audio 660 =snd/ -timer root:audio 660 =snd/ -hwC.* root:audio 660 =snd/ - -hpet root:audio 660 - -adsp root:audio 660 >sound/ -audio root:audio 660 >sound/ -dsp root:audio 660 >sound/ -mixer root:audio 660 >sound/ -sequencer.* root:audio 660 >sound/ +snd/.* root:audio 660 + +hpet root:audio 660 + +adsp root:audio 660 +audio root:audio 660 +dsp root:audio 660 +mixer root:audio 660 +sequencer.* root:audio 660 # network -net/.* root:root 600 @nameif diff --git a/mdev/lib/inputdev b/mdev/lib/inputdev index c02f872..02c20ee 100755 --- a/mdev/lib/inputdev +++ b/mdev/lib/inputdev @@ -6,6 +6,7 @@ set +x [ -n "$DEVNAME" ] || exit 0 [ "$SUBSYSTEM" = "input" ] || exit 0 +MDEV=$(basename ${MDEV}) BPATH="input" SPATH="/sys${DEVPATH}" @@ -15,25 +16,28 @@ then NAME=$(cat ${SPATH}/../name) fi +printf "bpath = '%s'; spath = '%s'; name = '%s';\n" "$BPATH" "$SPATH" "$NAME" \ + | logger -t daemon + cd $BPATH case "$ACTION" in add|"") - mv ../$MDEV . + #mv ../$MDEV . case "$NAME" in "TPPS/2 IBM TrackPoint") - ln -s $MDEV mouse + ln -fs $MDEV mouse ;; "AT Translated Set 2 keyboard") - ln -s $MDEV kbd + ln -fs $MDEV kbd ;; "ThinkPad Extra Buttons") - ln -s $MDEV extrabuttons + ln -fs $MDEV extrabuttons ;; esac ;; remove) - rm -f $MDEV + #rm -f $MDEV case "$NAME" in "TPPS/2 IBM TrackPoint") |