From: kay.sievers@vrfy.org Date: Sun, 10 Apr 2005 19:19:51 +0000 (+0200) Subject: [PATCH] update Debian rules X-Git-Tag: 057~4 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7ab16233831bb90b2ee14e7ee98c3dde77276a9e [PATCH] update Debian rules --- diff --git a/etc/udev/debian/devfs.rules b/etc/udev/debian/devfs.rules index cffef1a2e..0453e66d5 100644 --- a/etc/udev/debian/devfs.rules +++ b/etc/udev/debian/devfs.rules @@ -13,56 +13,19 @@ # %% the '%' char itself. # -# default permissions for block devices -SUBSYSTEM="block", GROUP="disk" -SUBSYSTEM="block", SYSFS{removable}="1", GROUP="floppy" - # workaround for devices which do not report media changes BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/model", RESULT="IOMEGA ZIP *", \ - NAME{all_partitions}="%k%n", GROUP="floppy" + PROGRAM="/etc/udev/scripts/ide-model.sh %k", RESULT="IOMEGA ZIP *", \ + OPTIONS="all_partitions", NAME="%k" # IDE devices -BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom*", \ - GROUP="cdrom" -BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy*", \ - GROUP="floppy" BUS="ide", KERNEL="hd[a-z]*", \ - PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="ide", KERNEL="ht[0-9]*", GROUP="tape" -BUS="ide", KERNEL="nht[0-9]*", GROUP="tape" + PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", \ + NAME="%c{1}", SYMLINK="%k %c{2}" # SCSI devices -BUS="scsi", KERNEL="sd[a-z]", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="scsi", KERNEL="sd[a-z][0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="scsi", KERNEL="sd[a-i][a-z]", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="scsi", KERNEL="sd[a-i][a-z][0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="scsi", KERNEL="s[gr][0-9]*", SYSFS{type}="5", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}", GROUP="cdrom" -BUS="scsi", KERNEL="sr[0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}", GROUP="cdrom" -BUS="scsi", KERNEL="sg[0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}" -BUS="scsi", KERNEL="st[0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}", GROUP="tape" -BUS="scsi", KERNEL="nst[0-9]*", \ - PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ - NAME="%c{1}", SYMLINK="%k %c{2}", GROUP="tape" +BUS="scsi", PROGRAM="/etc/udev/scripts/scsi-devfs.sh %k %b %n", \ + NAME="%c{1}", SYMLINK="%k %c{2}" # RAID controllers KERNEL="cciss!*", PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", \ @@ -78,15 +41,15 @@ KERNEL="loop[0-9]*", NAME="loop/%n" KERNEL="ram[0-9]*", NAME="rd/%n" # USB devices -BUS="usb", KERNEL="hiddev*", NAME="usb/%k" BUS="usb", KERNEL="auer[0-9]*", NAME="usb/%k" -BUS="usb", KERNEL="legousbtower*", NAME="usb/%k", MODE="0666" -BUS="usb", KERNEL="dabusb*", NAME="usb/%k" BUS="usb", KERNEL="cpad[0-9]*", NAME="usb/%k" +BUS="usb", KERNEL="dabusb*", NAME="usb/%k" +BUS="usb", KERNEL="hiddev*", NAME="usb/%k" +BUS="usb", KERNEL="legousbtower*", NAME="usb/%k" +BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" BUS="usb", KERNEL="ttyUSB*", SYSFS{product}="Palm Handheld*", SYMLINK="pilot" # serial devices -SUBSYSTEM="tty", GROUP="dialout" KERNEL="ttyS[0-9]*", NAME="tts/%n" KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" KERNEL="rfcomm[0-9]*", NAME="bluetooth/rfcomm/%n", @@ -94,8 +57,6 @@ KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20" KERNEL="capi[0-9]*", NAME="capi/%n" # vc devices -KERNEL="ptmx", MODE="0666" -KERNEL="tty", MODE="0666" KERNEL="tty[0-9]*", NAME="vc/%n" KERNEL="vcs", NAME="vcc/0" KERNEL="vcs[0-9]*", NAME="vcc/%n" @@ -103,49 +64,32 @@ KERNEL="vcsa", NAME="vcc/a0" KERNEL="vcsa[0-9]*", NAME="vcc/a%n" # video devices -SUBSYSTEM="video4linux", GROUP="video" KERNEL="video[0-9]*", NAME="v4l/%k" KERNEL="radio[0-9]*", NAME="v4l/%k" KERNEL="vbi[0-9]*", NAME="v4l/%k" KERNEL="vtx[0-9]*", NAME="v4l/%k" -KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", \ - NAME="%c", GROUP="video" -KERNEL="fb[0-9]*", NAME="fb/%n", GROUP="video" -KERNEL="nvidia*", GROUP="video" -KERNEL="card[0-9]*", NAME="dri/%k", GROUP="video" +KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c" +KERNEL="fb[0-9]*", NAME="fb/%n" +KERNEL="card[0-9]*", NAME="dri/%k" # misc devices -KERNEL="random", MODE="0666" -KERNEL="urandom", MODE="0444" -KERNEL="mem", MODE="0640", GROUP="kmem" -KERNEL="kmem", MODE="0640", GROUP="kmem" -KERNEL="port", MODE="0640", GROUP="kmem" -KERNEL="full", MODE="0666" -KERNEL="null", MODE="0666" -KERNEL="zero", MODE="0666" -KERNEL="inotify", MODE="0666" -KERNEL="sgi_fetchop", MODE="0666" -KERNEL="sonypi", MODE="0666" KERNEL="apm_bios", NAME="misc/%k", -KERNEL="agpgart", NAME="misc/%k", GROUP="video" -KERNEL="nvram", NAME="misc/%k", GROUP="nvram" +KERNEL="agpgart", NAME="misc/%k" +KERNEL="nvram", NAME="misc/%k" KERNEL="psaux", NAME="misc/%k" -KERNEL="rtc", NAME="misc/%k", MODE="0644", GROUP="audio" +KERNEL="rtc", NAME="misc/%k" KERNEL="hw_random", NAME="hwrng" # printers and parallel devices -SUBSYSTEM="printer", GROUP="lp" -BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" KERNEL="lp[0-9]*", NAME="printers/%n" -KERNEL="pt[0-9]*", GROUP="tape" -KERNEL="pht[0-9]*", GROUP="tape" +KERNEL="parport[0-9]*", NAME="parports/%n" KERNEL="i2c-[0-9]*", NAME="i2c/%n" -KERNEL="fd[0-9]*", NAME="floppy/%n", GROUP="floppy" +KERNEL="fd[0-9]*", NAME="floppy/%n" -KERNEL="cdemu[0-9]*", NAME="cdemu/%n", GROUP="cdrom" -KERNEL="pktcdvd[0-9]*", NAME="pktcdvd/%n", GROUP="cdrom" -KERNEL="pktcdvd", NAME="pktcdvd/control", MODE="0644" +KERNEL="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL="pktcdvd", NAME="pktcdvd/control" KERNEL="cpu[0-9]*", NAME="cpu/%n/cpuid" KERNEL="msr[0-9]*", NAME="cpu/%n/msr" @@ -158,7 +102,6 @@ KERNEL="tap[0-9]*", NAME="net/%k" KERNEL="tun", NAME="net/%k" # sound devices -SUBSYSTEM="sound", GROUP="audio" KERNEL="controlC[0-9]*", NAME="snd/%k" KERNEL="hwC[D0-9]*", NAME="snd/%k" KERNEL="pcmC[D0-9cp]*", NAME="snd/%k" @@ -178,11 +121,8 @@ KERNEL="admmidi*", NAME="sound/%k" # input devices KERNEL="mice", NAME="input/%k" KERNEL="mouse[0-9]*", NAME="input/%k" -KERNEL="event[0-9]*", NAME="input/%k", \ - PROGRAM="/etc/udev/scripts/inputdev.sh %k", RESULT="inputdev", \ - MODE="0664", GROUP="video" KERNEL="event[0-9]*", NAME="input/%k" -KERNEL="js[0-9]*", NAME="input/%k", MODE="0664" +KERNEL="js[0-9]*", NAME="input/%k" KERNEL="ts[0-9]*", NAME="input/%k" KERNEL="uinput", NAME="input/%k" @@ -193,7 +133,12 @@ KERNEL="zapchannel", NAME="zap/channel" KERNEL="zappseudo", NAME="zap/pseudo" KERNEL="zap[0-9]*", NAME="zap/%n" +# AOE character devices +SUBSYSTEM="aoe", KERNEL="discover", NAME="etherd/%k" +SUBSYSTEM="aoe", KERNEL="err", NAME="etherd/%k" +SUBSYSTEM="aoe", KERNEL="interfaces", NAME="etherd/%k" + # device mapper creates its own device nodes, so ignore these -KERNEL="dm-[0-9]*", NAME="" +KERNEL="dm-[0-9]*", OPTIONS="ignore_device" KERNEL="device-mapper", NAME="mapper/control" diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules new file mode 100644 index 000000000..48510e67f --- /dev/null +++ b/etc/udev/debian/permissions.rules @@ -0,0 +1,73 @@ +# default permissions for block devices +SUBSYSTEM="block", GROUP="disk" +SUBSYSTEM="block", SYSFS{removable}="1", GROUP="floppy" + +# IDE devices +BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ + PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom*", GROUP="cdrom" +BUS="ide", KERNEL="ht[0-9]*", GROUP="tape" +BUS="ide", KERNEL="nht[0-9]*", GROUP="tape" + +# SCSI devices +BUS="scsi", SYSFS{type}="1", GROUP="tape" +BUS="scsi", SYSFS{type}="5", GROUP="cdrom" +BUS="scsi", SYSFS{type}="6", GROUP="scanner" + +# USB devices +BUS="usb", KERNEL="legousbtower*", MODE="0666" + +# serial devices +SUBSYSTEM="tty", GROUP="dialout" +SUBSYSTEM="capi", GROUP="dialout" + +# vc devices (all members of the tty subsystem) +KERNEL="ptmx", MODE="0666", GROUP="root" +KERNEL="console", MODE="0600", GROUP="root" +KERNEL="tty", MODE="0666", GROUP="root" +KERNEL="tty[0-9]*", GROUP="root" + +# video devices +SUBSYSTEM="video4linux", GROUP="video" +SUBSYSTEM="dvb", GROUP="video" +SUBSYSTEM="graphics", GROUP="video" +SUBSYSTEM="nvidia", GROUP="video" +SUBSYSTEM="drm", GROUP="video" + +# misc devices +KERNEL="random", MODE="0666" +KERNEL="urandom", MODE="0444" +KERNEL="mem", MODE="0640", GROUP="kmem" +KERNEL="kmem", MODE="0640", GROUP="kmem" +KERNEL="port", MODE="0640", GROUP="kmem" +KERNEL="full", MODE="0666" +KERNEL="null", MODE="0666" +KERNEL="zero", MODE="0666" +KERNEL="inotify", MODE="0666" +KERNEL="sgi_fetchop", MODE="0666" +KERNEL="sonypi", MODE="0666" +KERNEL="agpgart", GROUP="video" +KERNEL="nvram", GROUP="nvram" +KERNEL="rtc", MODE="0660", GROUP="audio" + +KERNEL="cdemu[0-9]*", GROUP="cdrom" +KERNEL="pktcdvd[0-9]*", GROUP="cdrom" +KERNEL="pktcdvd", MODE="0644" + +# printers and parallel devices +SUBSYSTEM="printer", GROUP="lp" +SUBSYSTEM="ppdev", GROUP="lp" +KERNEL="pt[0-9]*", GROUP="tape" +KERNEL="pht[0-9]*", GROUP="tape" + +# sound devices +SUBSYSTEM="sound", GROUP="audio" + +# input devices +KERNEL="event[0-9]*", PROGRAM="/etc/udev/scripts/inputdev.sh %k", \ + RESULT="inputdev", MODE="0664", GROUP="video" +KERNEL="js[0-9]*", MODE="0664" + +# AOE character devices +SUBSYSTEM="aoe", MODE="0220", GROUP="disk" +SUBSYSTEM="aoe", KERNEL="err", MODE="0440" + diff --git a/etc/udev/debian/udev.rules b/etc/udev/debian/udev.rules index 0f7aeb73d..a506a02ad 100644 --- a/etc/udev/debian/udev.rules +++ b/etc/udev/debian/udev.rules @@ -13,87 +13,37 @@ # %% the '%' char itself. # -# default permissions for block devices -SUBSYSTEM="block", GROUP="disk" -SUBSYSTEM="block", SYSFS{removable}="1", GROUP="floppy" - # workaround for devices which do not report media changes BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/model", RESULT="IOMEGA ZIP *", \ - NAME{all_partitions}="%k%n", GROUP="floppy" - -# IDE devices -BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom*", \ - GROUP="cdrom" -BUS="ide", KERNEL="hd[a-z]", SYSFS{removable}="1", \ - PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="floppy*", \ - GROUP="floppy" -BUS="ide", KERNEL="ht[0-9]*", GROUP="tape" -BUS="ide", KERNEL="nht[0-9]*", GROUP="tape" + PROGRAM="/etc/udev/scripts/ide-model.sh %k", RESULT="IOMEGA ZIP *", \ + OPTIONS="all_partitions", NAME="%k" # SCSI devices -BUS="scsi", KERNEL="sr[0-9]*", SYSFS{type}="5", \ - NAME="scd%n", SYMLINK="sr%n", GROUP="cdrom" -BUS="scsi", KERNEL="sg[0-9]*", SYSFS{type}="5", GROUP="cdrom" -BUS="scsi", KERNEL="st[0-9]*", GROUP="tape" -BUS="scsi", KERNEL="nst[0-9]*", GROUP="tape" -BUS="scsi", KERNEL="osst[0-9]*", GROUP="tape" -BUS="scsi", KERNEL="nosst[0-9]*", GROUP="tape" +BUS="scsi", KERNEL="sr[0-9]*", NAME="scd%n", SYMLINK="sr%n" # USB devices BUS="usb", KERNEL="hiddev*", NAME="usb/%k" BUS="usb", KERNEL="auer[0-9]*", NAME="usb/%k" -BUS="usb", KERNEL="legousbtower*", NAME="usb/%k", MODE="0666" +BUS="usb", KERNEL="legousbtower*", NAME="usb/%k" BUS="usb", KERNEL="dabusb*", NAME="usb/%k" BUS="usb", KERNEL="cpad[0-9]*", NAME="usb/%k" +BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" BUS="usb", KERNEL="ttyUSB*", SYSFS{product}="Palm Handheld*", SYMLINK="pilot" # serial devices -SUBSYSTEM="tty", GROUP="dialout" KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20" KERNEL="capi[0-9]*", NAME="capi/%n" -# vc devices -KERNEL="ptmx", MODE="0666" -KERNEL="tty", MODE="0666" - # video devices -SUBSYSTEM="video4linux", GROUP="video" -KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", \ - NAME="%c", GROUP="video" -KERNEL="fb[0-9]*", GROUP="video" -KERNEL="nvidia*", GROUP="video" -KERNEL="card[0-9]*", NAME="dri/%k", GROUP="video" +KERNEL="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c" +KERNEL="card[0-9]*", NAME="dri/%k" # misc devices -KERNEL="random", MODE="0666" -KERNEL="urandom", MODE="0444" -KERNEL="mem", MODE="0640", GROUP="kmem" -KERNEL="kmem", MODE="0640", GROUP="kmem" -KERNEL="port", MODE="0640", GROUP="kmem" -KERNEL="full", MODE="0666" -KERNEL="null", MODE="0666" -KERNEL="zero", MODE="0666" -KERNEL="inotify", MODE="0666" -KERNEL="sgi_fetchop", MODE="0666" -KERNEL="sonypi", MODE="0666" -KERNEL="agpgart", GROUP="video" -KERNEL="nvram", GROUP="nvram" -KERNEL="rtc", MODE="0664", GROUP="audio" KERNEL="hw_random", NAME="hwrng" -# printers and parallel devices -SUBSYSTEM="printer", GROUP="lp" -BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k" -KERNEL="pt[0-9]*", GROUP="tape" -KERNEL="pht[0-9]*", GROUP="tape" - -KERNEL="fd[0-9]*", GROUP="floppy" - -KERNEL="cdemu[0-9]*", NAME="cdemu/%n", GROUP="cdrom" -KERNEL="pktcdvd[0-9]*", NAME="pktcdvd/%n", GROUP="cdrom" -KERNEL="pktcdvd", NAME="pktcdvd/control", MODE="0644" +KERNEL="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL="pktcdvd", NAME="pktcdvd/control" KERNEL="cpu[0-9]*", NAME="cpu/%n/cpuid" KERNEL="msr[0-9]*", NAME="cpu/%n/msr" @@ -106,7 +56,6 @@ KERNEL="tap[0-9]*", NAME="net/%k" KERNEL="tun", NAME="net/%k" # ALSA devices -SUBSYSTEM="sound", GROUP="audio" KERNEL="controlC[0-9]*", NAME="snd/%k" KERNEL="hwC[D0-9]*", NAME="snd/%k" KERNEL="pcmC[D0-9cp]*", NAME="snd/%k" @@ -117,11 +66,8 @@ KERNEL="seq", NAME="snd/%k" # input devices KERNEL="mice", NAME="input/%k" KERNEL="mouse[0-9]*", NAME="input/%k" -KERNEL="event[0-9]*", NAME="input/%k", \ - PROGRAM="/etc/udev/scripts/inputdev.sh %k", RESULT="inputdev", \ - MODE="0664", GROUP="video" KERNEL="event[0-9]*", NAME="input/%k" -KERNEL="js[0-9]*", NAME="input/%k", MODE="0664" +KERNEL="js[0-9]*", NAME="input/%k" KERNEL="ts[0-9]*", NAME="input/%k" KERNEL="uinput", NAME="input/%k" @@ -132,7 +78,12 @@ KERNEL="zapchannel", NAME="zap/channel" KERNEL="zappseudo", NAME="zap/pseudo" KERNEL="zap[0-9]*", NAME="zap/%n" +# AOE character devices +SUBSYSTEM="aoe", KERNEL="discover", NAME="etherd/%k" +SUBSYSTEM="aoe", KERNEL="err", NAME="etherd/%k" +SUBSYSTEM="aoe", KERNEL="interfaces", NAME="etherd/%k" + # device mapper creates its own device nodes, so ignore these -KERNEL="dm-[0-9]*", NAME="" +KERNEL="dm-[0-9]*", OPTIONS="ignore_device" KERNEL="device-mapper", NAME="mapper/control"