From a7cb7d79f787614b9c4ade94a7a95144ef46eacd Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 22 Dec 2008 16:15:37 +0100 Subject: rules: second round merging with Ubuntu rules --- rules/rules.d/50-udev-default.rules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'rules') diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules index 5d91cb6a09..d6fdf00bf9 100644 --- a/rules/rules.d/50-udev-default.rules +++ b/rules/rules.d/50-udev-default.rules @@ -3,17 +3,17 @@ SUBSYSTEM=="block", SYMLINK+="block/%M:%m" SUBSYSTEM!="block", SYMLINK+="char/%M:%m" -KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule" -KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule" -KERNEL=="ptmx", GROUP="tty", MODE="0666", OPTIONS+="last_rule" -KERNEL=="tty", GROUP="tty", MODE="0666", OPTIONS+="last_rule" -KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620", OPTIONS+="last_rule" -KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS+="last_rule" -KERNEL=="console", MODE="0600", OPTIONS+="last_rule" +KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" +KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660" +KERNEL=="ptmx", GROUP="tty", MODE="0666" +KERNEL=="tty", GROUP="tty", MODE="0666" +KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" +KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty" +KERNEL=="console", MODE="0600" # serial KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp" -KERNEL=="ppp", MODE="0600", OPTIONS+="ignore_remove" +KERNEL=="ppp", MODE="0600" KERNEL=="mwave", NAME="modems/mwave", GROUP="uucp" KERNEL=="hvc*|hvsi*", GROUP="uucp" @@ -79,7 +79,7 @@ SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk", MODE="0220" SUBSYSTEM=="aoe", KERNEL=="err", MODE="0440" # network -KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove" +KERNEL=="tun", NAME="net/%k", MODE="0666" # CPU KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" @@ -105,4 +105,4 @@ KERNEL=="cpad[0-9]*", NAME="usb/%k" # do not delete static device nodes ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove" - +ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove" -- cgit v1.2.3-54-g00ecf