rules: Ubuntu merge - s/uucp/dialout/

diff --git a/NEWS b/NEWS
index 90a68d36525152f171c582f70268b7b245c74076..1a1d5fb71e5a77bf0a159641c467ec7c7a35f282 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,11 +9,12 @@ nodes should be reliably created, but some rules and libudev will
 not work correctly because the old kernels do not provide the expected
 information or interfaces.
 
 not work correctly because the old kernels do not provide the expected
 information or interfaces.
 

-We are currently merging the Ubuntu rules in the udev default rules, and
-get one step closer to provide a common Linux /dev setup regarding device
-names, symlinks, and default device permissions. On udev startup, we now
-expect the following groups to be resolvable to their ids by glibc's
-getgrnam(): "disk cdrom floppy tape audio video lp tty kmem".
+We are currently merging the Ubuntu rules in the udev default rules,
+and get one step closer to provide a common Linux /dev setup regarding
+device names, symlinks, and default device permissions. On udev startup,
+we now expect the following groups to be resolvable to their ids by
+glibc's getgrnam():
+  disk, cdrom, floppy, tape, audio, video, lp, tty, dialout, kmem.

 
 /dev/serial/by-{id,path}/ now contains links for ttyUSB devices,
 which do not depend on the kernel device name. As usual, unique
 
 /dev/serial/by-{id,path}/ now contains links for ttyUSB devices,
 which do not depend on the kernel device name. As usual, unique

diff --git a/README b/README
index ecb520b2fda066a4aa725ad1b75418f8d578f0d5..cd3628736fecd06804043b441e417fe83634e850 100644 (file)
--- a/README
+++ b/README
@@ -20,7 +20,7 @@ Requirements:
     be mounted at /sys/. No other locations are supported by udev.
 
   - The system must have the following group names resolvable at udev startup:
     be mounted at /sys/. No other locations are supported by udev.
 
   - The system must have the following group names resolvable at udev startup:

-      disk cdrom floppy tape audio video lp tty kmem
+      disk, cdrom, floppy, tape, audio, video, lp, tty, dialout, kmem

     Especially in LDAP setups, it is required, that getgrnam() is able to resolve
     these group names while no network is available.
 
     Especially in LDAP setups, it is required, that getgrnam() is able to resolve
     these group names while no network is available.
 

diff --git a/rules/packages/40-isdn.rules b/rules/packages/40-isdn.rules
index 22d9fe691b4948aea38d568a68602b4c44d7307d..1a31cb6c9897bf0d6e2b308057f65679a29b2761 100644 (file)
--- 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
 
 # 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"
 SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"

diff --git a/rules/packages/40-ppc.rules b/rules/packages/40-ppc.rules
index 8b62d79e0cfc330a34ff83bebfbe11311d6af9ce..47ecdd00272956a585377765fe7d53beb826db63 100644 (file)
--- 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/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 38e1aa6b15585119b8d937c611e29577e84b7f80..120c58152d4ea02ee1baccad8d521f996b90d6ea 100644 (file)
--- 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=="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=="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"
 
 # mem
 KERNEL=="null|zero|full|random|urandom", MODE="0666"