diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2009-01-27 10:42:16 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2009-01-27 10:42:16 +0000 |
| commit | 4d5fee82e5c66a1439c374768d640d9a0f85b712 (patch) | |
| tree | 59386482a9ea922dbdc8dd14e3225b9e2fbc8333 /sys-fs/udev/files | |
| parent | alpha/ia64/x86 stable wrt #255820 (diff) | |
| download | gentoo-2-4d5fee82e5c66a1439c374768d640d9a0f85b712.tar.gz gentoo-2-4d5fee82e5c66a1439c374768d640d9a0f85b712.tar.bz2 gentoo-2-4d5fee82e5c66a1439c374768d640d9a0f85b712.zip | |
Cleanup depends. Add missing depends for documentation processing of udev-9999. Fix kernel version check of udev-9999. Update rules patch for udev-137, move all rules in one file.
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'sys-fs/udev/files')
| -rw-r--r-- | sys-fs/udev/files/udev-137-rules-update.diff | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/sys-fs/udev/files/udev-137-rules-update.diff b/sys-fs/udev/files/udev-137-rules-update.diff index 8e1a6d4a0d0b..7013e8f41bca 100644 --- a/sys-fs/udev/files/udev-137-rules-update.diff +++ b/sys-fs/udev/files/udev-137-rules-update.diff @@ -2,7 +2,7 @@ Index: udev-git/rules/gentoo/40-gentoo.rules =================================================================== --- udev-git.orig/rules/gentoo/40-gentoo.rules +++ udev-git/rules/gentoo/40-gentoo.rules -@@ -1,12 +1,12 @@ +@@ -1,12 +1,25 @@ # do not edit this file, it will be overwritten on update -# capi devices @@ -15,17 +15,30 @@ Index: udev-git/rules/gentoo/40-gentoo.rules KERNEL=="loop[0-9]*", SYMLINK+="loop/%n" KERNEL=="ram[0-9]*", SYMLINK+="rd/%n" -+# keep devices after unload ++# keep devices after driver unload +KERNEL=="ppp", OPTIONS+="ignore_remove" +KERNEL=="tun", OPTIONS+="ignore_remove" + ++ ++# setting permissions ++SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" ++ ++# dialout devices ++KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" ++ ++# sound devices (oss) ++SUBSYSTEM=="snd", GROUP="audio" ++ ++# Sony Vaio Jogdial sonypi device ++KERNEL=="sonypi", MODE="0666" ++ Index: udev-git/rules/gentoo/65-permissions.rules =================================================================== --- udev-git.orig/rules/gentoo/65-permissions.rules -+++ udev-git/rules/gentoo/65-permissions.rules -@@ -1,25 +1,12 @@ - # do not edit this file, it will be overwritten on update - ++++ /dev/null +@@ -1,26 +0,0 @@ +-# do not edit this file, it will be overwritten on update +- -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb", MODE="664" - -# cdrom devices @@ -39,17 +52,14 @@ Index: udev-git/rules/gentoo/65-permissions.rules -KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht[0-9]*|pt[0-9]*|npt[0-9]*", \ - GROUP="tape", MODE="660" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660" -+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - - # dialout devices +- +-# dialout devices -KERNEL=="ippp*|isdn*|dcbri*|capi*|rfcomm*|ttyACM[0-9]*", GROUP="uucp" -KERNEL=="pilot", GROUP="uucp" -+KERNEL=="ippp*|isdn*|dcbri*|rfcomm*|ttyACM[0-9]*|pilot", GROUP="uucp" - +- -# sound devices (sound=alsa, snd=oss) -SUBSYSTEM=="sound|snd", GROUP="audio" -+# sound devices (oss) -+SUBSYSTEM=="snd", GROUP="audio" - - # Sony Vaio Jogdial sonypi device - KERNEL=="sonypi", MODE="0666" +- +-# Sony Vaio Jogdial sonypi device +-KERNEL=="sonypi", MODE="0666" +- |