aboutsummaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-04 17:01:47 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-01-04 17:01:47 +0100
commit1aa8fdf779219d953633323b4206acadc8b8e37b (patch)
treebdb0c0915edd9dbe56eef59fd1152f1e02aec672 /rules
parente1cc6b6a81f9ed64e29eea5ccbe79616a220ee9f (diff)
downloadudev-1aa8fdf779219d953633323b4206acadc8b8e37b.tar.gz
rules: Ubuntu merge - s/uucp/dialout/
Diffstat (limited to 'rules')
-rw-r--r--rules/packages/40-isdn.rules2
-rw-r--r--rules/packages/40-ppc.rules2
-rw-r--r--rules/rules.d/50-udev-default.rules6
3 files changed, 5 insertions, 5 deletions
diff --git a/rules/packages/40-isdn.rules b/rules/packages/40-isdn.rules
index 22d9fe69..1a31cb6c 100644
--- a/rules/packages/40-isdn.rules
+++ b/rules/packages/40-isdn.rules
@@ -1,4 +1,4 @@
# do not edit this file, it will be overwritten on update
-SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="uucp"
+SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout"
SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"
diff --git a/rules/packages/40-ppc.rules b/rules/packages/40-ppc.rules
index 8b62d79e..47ecdd00 100644
--- a/rules/packages/40-ppc.rules
+++ b/rules/packages/40-ppc.rules
@@ -3,4 +3,4 @@
KERNEL=="iseries/ibmsis*", NAME="%k", GROUP="disk"
KERNEL=="iseries/nvt*", NAME="%k", GROUP="disk"
KERNEL=="iseries/vt*", NAME="%k", GROUP="disk"
-KERNEL=="iseries/vtty*", GROUP="uucp"
+KERNEL=="iseries/vtty*", GROUP="dialout"
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 38e1aa6b..120c5815 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -12,10 +12,10 @@ 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=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="dialout"
KERNEL=="ppp", MODE="0600"
-KERNEL=="mwave", NAME="modems/mwave", GROUP="uucp"
-KERNEL=="hvc*|hvsi*", GROUP="uucp"
+KERNEL=="mwave", NAME="modems/mwave", GROUP="dialout"
+KERNEL=="hvc*|hvsi*", GROUP="dialout"
# mem
KERNEL=="null|zero|full|random|urandom", MODE="0666"