[PATCH] simplify rules file by setting default mode to 0660

On Sun, 2004-12-19 at 18:31 +0100, Marco d'Itri wrote:
> It may be better to use default_mode="0660", I do not think that there
> are any mode 600 devices. This would allow setting only the group for
> most of them.

diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index d91363c6d217309a98c354fbbf6723e7d579e062..7d5aaa7d72f3286bfbde0e6a5b32438e8a86bf23 100644 (file)
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -19,17 +19,17 @@ BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYM
 
 # devfs-names for ide-devices (uncomment only one)
 #  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}", MODE="0660"
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}"
 
 # disk devices
-KERNEL="sd*",          NAME="%k", GROUP="disk", MODE="0660"
-KERNEL="dasd*",                NAME="%k", GROUP="disk", MODE="0660"
-KERNEL="ataraid*",     NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="sd*",          NAME="%k", GROUP="disk"
+KERNEL="dasd*",                NAME="%k", GROUP="disk"
+KERNEL="ataraid*",     NAME="%k", GROUP="disk"
 
 # dri devices
-KERNEL="card*",                NAME="dri/card%n", GROUP="video", MODE="0660"
-KERNEL="nvidia*",      NAME="%k", GROUP="video", MODE="0660"
-KERNEL="3dfx*",                NAME="%k", GROUP="video", MODE="0660"
+KERNEL="card*",                NAME="dri/card%n", GROUP="video"
+KERNEL="nvidia*",      NAME="%k", GROUP="video"
+KERNEL="3dfx*",                NAME="%k", GROUP="video"
 
 # alsa devices
 KERNEL="controlC[0-9]*",       NAME="snd/%k"
@@ -59,7 +59,7 @@ KERNEL="device-mapper",       NAME="mapper/control"
 KERNEL="fb[0-9]*",     NAME="fb/%n", SYMLINK="%k"
 
 # floppy devices
-KERNEL="fd[0-9]*",     NAME="floppy/%n", SYMLINK="%k", GROUP="floppy", MODE="0660"
+KERNEL="fd[0-9]*",     NAME="floppy/%n", SYMLINK="%k", GROUP="floppy"
 
 # i2c devices
 KERNEL="i2c-[0-9]*",   NAME="i2c/%n", SYMLINK="%k"
@@ -72,10 +72,10 @@ KERNEL="js*",               NAME="input/%k", MODE="664"
 KERNEL="ts*",          NAME="input/%k", MODE="0600"
 
 # loop devices
-KERNEL="loop[0-9]*",   NAME="loop/%n", SYMLINK="%k", GROUP="disk", MODE="0660"
+KERNEL="loop[0-9]*",   NAME="loop/%n", SYMLINK="%k", GROUP="disk"
 
 # md block devices
-KERNEL="md[0-9]*",     NAME="md/%n", SYMLINK="%k", GROUP="disk", MODE="0660"
+KERNEL="md[0-9]*",     NAME="md/%n", SYMLINK="%k", GROUP="disk"
 
 # misc devices
 KERNEL="agpgart",      NAME="misc/%k", SYMLINK="%k"
@@ -105,42 +105,42 @@ KERNEL="tun",             NAME="net/%k"
 KERNEL="ram[0-9]*",    NAME="rd/%n", SYMLINK="%k"
 
 # raw devices
-KERNEL="raw[0-9]*",    NAME="raw/%k", GROUP="disk", MODE="0660"
-KERNEL="ram*",         NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="raw[0-9]*",    NAME="raw/%k", GROUP="disk"
+KERNEL="ram*",         NAME="%k", GROUP="disk"
 
 # sound devices
-KERNEL="adsp",                 NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="adsp[0-9]*",           NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="audio",                        NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="audio[0-9]*",          NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="dsp",                  NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="dsp[0-9]*",            NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="mixer",                        NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="mixer[0-9]*",          NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="sequencer",            NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
-KERNEL="sequencer[0-9]*",      NAME="sound/%k", SYMLINK="%k", GROUP="audio", MODE="0660"
+KERNEL="adsp",                 NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="adsp[0-9]*",           NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="audio",                        NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="audio[0-9]*",          NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="dsp",                  NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="dsp[0-9]*",            NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="mixer",                        NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="mixer[0-9]*",          NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="sequencer",            NAME="sound/%k", SYMLINK="%k", GROUP="audio"
+KERNEL="sequencer[0-9]*",      NAME="sound/%k", SYMLINK="%k", GROUP="audio"
 
 # tty devices
 KERNEL="console",      NAME="%k", GROUP="tty", MODE="0600"
 KERNEL="tty",          NAME="%k", GROUP="tty", MODE="0666"
-KERNEL="tty[0-9]*",    NAME="vc/%n",  SYMLINK="%k", GROUP="tty", MODE="0660"
-KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k", GROUP="tty", MODE="0660"
+KERNEL="tty[0-9]*",    NAME="vc/%n",  SYMLINK="%k", GROUP="tty"
+KERNEL="ttyS[0-9]*",   NAME="tts/%n", SYMLINK="%k", GROUP="tty"
 KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n", GROUP="tty", MODE="0600"
-KERNEL="ippp0",                NAME="%k", GROUP="tty", MODE="0660"
-KERNEL="isdn*",                NAME="%k", GROUP="tty", MODE="0660"
-KERNEL="dcbri*",       NAME="%k", GROUP="tty", MODE="0660"
-KERNEL="ircomm*",      NAME="%k", GROUP="tty", MODE="0660"
+KERNEL="ippp0",                NAME="%k", GROUP="tty"
+KERNEL="isdn*",                NAME="%k", GROUP="tty"
+KERNEL="dcbri*",       NAME="%k", GROUP="tty"
+KERNEL="ircomm*",      NAME="%k", GROUP="tty"
 
 # pty devices
 KERNEL="ptmx",                 NAME="%k", GROUP="tty", MODE="0666"
-KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k", GROUP="tty", MODE="0660"
-KERNEL="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k", GROUP="tty", MODE="0660"
+KERNEL="pty[p-za-e][0-9a-f]*", NAME="pty/m%n", SYMLINK="%k", GROUP="tty"
+KERNEL="tty[p-za-e][0-9a-f]*", NAME="pty/s%n", SYMLINK="%k", GROUP="tty"
 
 # vc devices
-KERNEL="vcs",          NAME="vcc/0",   SYMLINK="%k", GROUP="tty", MODE="0660"
-KERNEL="vcs[0-9]*",    NAME="vcc/%n",  SYMLINK="%k", GROUP="tty", MODE="0660"
-KERNEL="vcsa",         NAME="vcc/a0",  SYMLINK="%k", GROUP="tty", MODE="0660"
-KERNEL="vcsa[0-9]*",   NAME="vcc/a%n", SYMLINK="%k", GROUP="tty", MODE="0660"
+KERNEL="vcs",          NAME="vcc/0",   SYMLINK="%k", GROUP="tty"
+KERNEL="vcs[0-9]*",    NAME="vcc/%n",  SYMLINK="%k", GROUP="tty"
+KERNEL="vcsa",         NAME="vcc/a0",  SYMLINK="%k", GROUP="tty"
+KERNEL="vcsa[0-9]*",   NAME="vcc/a%n", SYMLINK="%k", GROUP="tty"
 
 # memory devices
 KERNEL="random",       NAME="%k", MODE="0666"
@@ -155,15 +155,15 @@ KERNEL="zero",            NAME="%k", MODE="0666"
 # usb devices
 KERNEL="hiddev*",              NAME="usb/%k"
 KERNEL="auer*",                        NAME="usb/%k"
-KERNEL="legousbtower*",                NAME="usb/%k", GROUP="usb", MODE="0660"
+KERNEL="legousbtower*",                NAME="usb/%k", GROUP="usb"
 KERNEL="dabusb*",              NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k", GROUP="lp", MODE="0660"
+BUS="usb", KERNEL="lp[0-9]*",  NAME="usb/%k", GROUP="lp"
 
 # v4l devices
-KERNEL="video[0-9]*",  NAME="v4l/video%n", SYMLINK="video%n", GROUP="video", MODE="0660"
-KERNEL="radio[0-9]*",  NAME="v4l/radio%n", GROUP="video", MODE="0660"
-KERNEL="vbi[0-9]*",    NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video", MODE="0660"
-KERNEL="vtx[0-9]*",    NAME="v4l/vtx%n", GROUP="video", MODE="0660"
+KERNEL="video[0-9]*",  NAME="v4l/video%n", SYMLINK="video%n", GROUP="video"
+KERNEL="radio[0-9]*",  NAME="v4l/radio%n", GROUP="video"
+KERNEL="vbi[0-9]*",    NAME="v4l/vbi%n", SYMLINK="vbi%n", GROUP="video"
+KERNEL="vtx[0-9]*",    NAME="v4l/vtx%n", GROUP="video"
 
 # Asterix Zaptel devices
 KERNEL="zapctl",       NAME="zap/ctl"
@@ -173,37 +173,37 @@ KERNEL="zappseudo",       NAME="zap/pseudo"
 KERNEL="zap[0-9]*",    NAME="zap/%n"
 
 # pilot/palm devices
-KERNEL="pilot",                NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL="pilot",                NAME="%k", GROUP="uucp"
 
 # jaz devices
-KERNEL="jaz*",         NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="jaz*",         NAME="%k", GROUP="disk"
 
 # zip devices
-KERNEL="pocketzip*",   NAME="%k", GROUP="disk", MODE="0660"
-KERNEL="zip*",         NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="pocketzip*",   NAME="%k", GROUP="disk"
+KERNEL="zip*",         NAME="%k", GROUP="disk"
 
 # ls120 devices
-KERNEL="ls120",                NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="ls120",                NAME="%k", GROUP="disk"
 
 # lp devices
-KERNEL="lp*",          NAME="%k", GROUP="lp", MODE="0660"
-KERNEL="irlpt",                NAME="%k", GROUP="lp", MODE="0660"
-KERNEL="usblp",                NAME="%k", GROUP="lp", MODE="0660"
-KERNEL="lp*",          NAME="%k", GROUP="lp", MODE="0660"
+KERNEL="lp*",          NAME="%k", GROUP="lp"
+KERNEL="irlpt",                NAME="%k", GROUP="lp"
+KERNEL="usblp",                NAME="%k", GROUP="lp"
+KERNEL="lp*",          NAME="%k", GROUP="lp"
 
 # tape devices
-KERNEL="ht*",          NAME="%k", GROUP="tape", MODE="0660"
-KERNEL="nht*",         NAME="%k", GROUP="tape", MODE="0660"
-KERNEL="pt*",          NAME="%k", GROUP="tape", MODE="0660"
-KERNEL="npt*",         NAME="%k", GROUP="tape", MODE="0660"
-KERNEL="st*",          NAME="%k", GROUP="tape", MODE="0660"
-KERNEL="nst*",         NAME="%k", GROUP="tape", MODE="0660"
+KERNEL="ht*",          NAME="%k", GROUP="tape"
+KERNEL="nht*",         NAME="%k", GROUP="tape"
+KERNEL="pt*",          NAME="%k", GROUP="tape"
+KERNEL="npt*",         NAME="%k", GROUP="tape"
+KERNEL="st*",          NAME="%k", GROUP="tape"
+KERNEL="nst*",         NAME="%k", GROUP="tape"
 
 # diskonkey devices
-KERNEL="diskonkey*",   NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="diskonkey*",   NAME="%k", GROUP="disk"
 
 # rem_ide devices
-KERNEL="microdrive*",  NAME="%k", GROUP="disk", MODE="0660"
+KERNEL="microdrive*",  NAME="%k", GROUP="disk"
 
 # kbd devices
 KERNEL="kbd",          NAME="%k", MODE="0664"

diff --git a/etc/udev/redhat/udev.rules b/etc/udev/redhat/udev.rules
index f95d2c1a1006a3d3359c5bcc0f71033a1965286e..5dc68237e7647e52544d5239277d553adb961bc5 100644 (file)
--- a/etc/udev/redhat/udev.rules
+++ b/etc/udev/redhat/udev.rules
@@ -10,18 +10,18 @@
 
 KERNEL="console",      NAME="%k", GROUP="tty", MODE="0600"
 KERNEL="tty",          NAME="%k", GROUP="tty", MODE="0666"
-KERNEL="tty[0-9]*",    NAME="%k", GROUP="tty", MODE="0660
+KERNEL="tty[0-9]*",    NAME="%k", GROUP="tty"
 
 KERNEL="ptmx",         NAME="%k", GROUP="tty", MODE="0666"
-KERNEL="pty[p-za-e][0-9a-f]*", NAME="%k", GROUP="tty", MODE="0660"
-KERNEL="tty[p-za-e][0-9a-f]*", NAME="%k", GROUP="tty", MODE="0660"
-
-KERNEL="ttyS[0-9]*",   NAME="%k", GROUP="uucp", MODE="0660"
-KERNEL="ttyUSB[0-9]*", NAME="%k", GROUP="uucp", MODE="0600"
-KERNEL="ippp0",                NAME="%k", MODE="0660"
-KERNEL="isdn*",                NAME="%k", MODE="0660"
-KERNEL="dcbri*",       NAME="%k", MODE="0660"
-KERNEL="ircomm*",      NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL="pty[p-za-e][0-9a-f]*", NAME="%k", GROUP="tty"
+KERNEL="tty[p-za-e][0-9a-f]*", NAME="%k", GROUP="tty"
+
+KERNEL="ttyS[0-9]*",   NAME="%k", GROUP="uucp"
+KERNEL="ttyUSB[0-9]*", NAME="%k", GROUP="uucp"
+KERNEL="ippp0",                NAME="%k"
+KERNEL="isdn*",                NAME="%k"
+KERNEL="dcbri*",       NAME="%k"
+KERNEL="ircomm*",      NAME="%k", GROUP="uucp"
 
 KERNEL="vcs",          NAME="%k", OWNER="vcsa", GROUP="tty", MODE="0600"
 KERNEL="vcsa[0-9]*",   NAME="%k", OWNER="vcsa", GROUP="tty", MODE="0600

diff --git a/etc/udev/udev.conf.in b/etc/udev/udev.conf.in
index 295e39ffd2ac0417c138ffa2246368e5c3205c02..a4a79ad5c2aab266a6b126854df284d8941f493b 100644 (file)
--- a/etc/udev/udev.conf.in
+++ b/etc/udev/udev.conf.in
@@ -16,7 +16,7 @@ udev_rules="@configdir@/rules.d"
 
 # default_mode - set the default mode for all nodes that have no
 #                permissions specified
-default_mode="0600"
+default_mode="0660"
 
 # default_owner - set the default owner for all nodes that have no
  #                permissions specified

diff --git a/test/udev-test.pl b/test/udev-test.pl
index 8ee8ba5414698f35ce9846584e1bdf27e1dd7268..9a581ce5276ff01d413c928fd369f5c01ee1bf54 100644 (file)
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -506,7 +506,7 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/tty33",
                exp_name        => "tty33",
-               exp_perms       => "0:0:0600",
+               exp_perms       => "0:0:0660",
                conf            => <<EOF
 KERNEL="tty33", NAME="tty33", OWNER="bad", GROUP="name"
 EOF
@@ -516,7 +516,7 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node",
-               exp_perms       => "5000::0600",
+               exp_perms       => "5000::0660",
                conf            => <<EOF
 BUS="scsi", KERNEL="sda", NAME="node", OWNER="5000"
 EOF
@@ -526,7 +526,7 @@ EOF
                subsys          => "block",
                devpath         => "/block/sda",
                exp_name        => "node",
-               exp_perms       => ":100:0600",
+               exp_perms       => ":100:0660",
                conf            => <<EOF
 BUS="scsi", KERNEL="sda", NAME="node", GROUP="100"
 EOF
@@ -566,7 +566,7 @@ EOF
                subsys          => "tty",
                devpath         => "/class/tty/ttyUSB0",
                exp_name        => "ttyUSB0",
-               exp_perms       => ":100:0600",
+               exp_perms       => ":100:0660",
                conf            => <<EOF
 KERNEL="ttyUSB[0-9]*", NAME="ttyUSB%n", GROUP="100"
 EOF
@@ -1185,7 +1185,7 @@ open CONF, ">$main_conf" || die "unable to create config file: $main_conf";
 print CONF "udev_root=\"$udev_root\"\n";
 print CONF "udev_db=\"$udev_db\"\n";
 print CONF "udev_rules=\"$conf_tmp\"\n";
-print CONF "default_mode=\"0600\"\n";
+print CONF "default_mode=\"0660\"\n";
 print CONF "default_owner=\"root\"\n";
 print CONF "default_group=\"root\"\n";
 close CONF;

diff --git a/udev.8.in b/udev.8.in
index 581d6f4ed5417bfa64a5037404167810f1c1d961..5d55b3282c256326c899f281c70e4cb8af71eb79 100644 (file)
--- a/udev.8.in
+++ b/udev.8.in
@@ -63,7 +63,7 @@ The default value is
 .B default_mode
 The default mode for all nodes where no explicit value is given by a rule.
 The default value is
-.IR 0600 .
+.IR 0660 .
 .TP
 .B default_owner
 The default owner for all nodes where no explicit value is given by a rule.
@@ -94,7 +94,7 @@ udev_log="yes"
 
 # default_mode - set the default mode for all nodes that have no
 #                permissions specified
-default_mode="0666"
+default_mode="0660"
 
 # default_owner - set the default owner for all nodes that have no
 #                 permissions specified

diff --git a/udev_config.c b/udev_config.c
index a5f64677482199466392abbd5156d905b14913f0..31c2a86ed1c1b3ce09ff99cd896a2a2c33b92837 100644 (file)
--- a/udev_config.c
+++ b/udev_config.c
@@ -76,7 +76,7 @@ static void init_variables(void)
 
        strcpy(default_owner, "root");
        strcpy(default_group, "root");
-       default_mode = 0600;
+       default_mode = 0660;
 
        udev_log = string_is_true(UDEV_LOG_DEFAULT);