diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:52:51 +0100 |
| commit | 58d31896056e604185acf3606b99257cea519dd1 (patch) | |
| tree | 3a0fb34da5dbe8dc12326fcd7fbf0c3916028f41 /package/base-files/src/etc/mdev.conf | |
| parent | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (diff) | |
| parent | 845317b460ee99ad633534cad4de72404af7e30b (diff) | |
resolve merge conflicts
Diffstat (limited to 'package/base-files/src/etc/mdev.conf')
| -rw-r--r-- | package/base-files/src/etc/mdev.conf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf index 69d9c0079..173a851f3 100644 --- a/package/base-files/src/etc/mdev.conf +++ b/package/base-files/src/etc/mdev.conf @@ -1,13 +1,15 @@ -rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc -device-mapper 0:0 660 @mkdir /dev/mapper -tun 0:0 660 >net/tun null 0:0 777 zero 0:0 666 u?random 0:0 644 -console 0:0 0600 +console 0:0 600 ptmx 0:0 666 tty 0:0 666 +tty[0-9]* 0:0 666 ttyS* 0:0 640 +rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc +device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper +tun 0:0 660 >net/tun +fb? root:video 660 audio root:audio 660 >snd/audio dsp root:audio 660 >snd/dsp timer root:audio 660 >snd/timer |