From 57d057d28d96fdbf36b7a5f32ded7af5d3b8d6f1 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam@gentoo.org>
Date: Tue, 27 Jan 2009 11:56:45 +0100
Subject: [PATCH] rules: Gentoo update

---
 rules/gentoo/40-gentoo.rules      | 21 +++++++++++++++++----
 rules/gentoo/65-permissions.rules | 26 --------------------------
 2 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 rules/gentoo/65-permissions.rules

diff --git a/rules/gentoo/40-gentoo.rules b/rules/gentoo/40-gentoo.rules
index 99a1c66c6..4751b51bc 100644
--- a/rules/gentoo/40-gentoo.rules
+++ b/rules/gentoo/40-gentoo.rules
@@ -1,12 +1,25 @@
 # do not edit this file, it will be overwritten on update
 
-# capi devices
-KERNEL=="capi",		NAME="capi20", SYMLINK+="isdn/capi20"
-KERNEL=="capi*",	NAME="capi/%n"
-
 # old devfs path, removing this could break systems
 # Bug 195839
 KERNEL=="md[0-9]*",	SYMLINK+="md/%n"
 KERNEL=="loop[0-9]*",	SYMLINK+="loop/%n"
 KERNEL=="ram[0-9]*",	SYMLINK+="rd/%n"
 
+# 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="dialout"
+
+# sound devices (oss)
+SUBSYSTEM=="snd",	GROUP="audio"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",	MODE="0666"
+
diff --git a/rules/gentoo/65-permissions.rules b/rules/gentoo/65-permissions.rules
deleted file mode 100644
index 173e08783..000000000
--- a/rules/gentoo/65-permissions.rules
+++ /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
-ENV{ID_CDROM}=="?*", GROUP="cdrom", MODE="660"
-KERNEL=="pktcdvd|pktcdvd[0-9]*", GROUP="cdrom", MODE="660"
-# assign cdrom-permission also to associated generic device (for cd-burning ...)
-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[45]", GROUP="cdrom", MODE="660"
-
-
-# tape devices
-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"
-
-# dialout devices
-KERNEL=="ippp*|isdn*|dcbri*|capi*|rfcomm*|ttyACM[0-9]*", GROUP="uucp"
-KERNEL=="pilot",	GROUP="uucp"
-
-# sound devices (sound=alsa, snd=oss)
-SUBSYSTEM=="sound|snd",	GROUP="audio"
-
-# Sony Vaio Jogdial sonypi device
-KERNEL=="sonypi",	MODE="0666"
-
-- 
2.30.2