X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=etc%2Fudev%2Fsuse%2F50-udev-default.rules;h=32e5008e79cdae2faebe04b8beb3b1e82c7fb920;hp=bbbcc7f585faaaa632802456876a447b18325076;hb=2e23125e112c0a56e1ccee193c2cfe0e26af1bad;hpb=a990821d93889cf087f150b0b8d03b1f7b8e3682

diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules
index bbbcc7f58..32e5008e7 100644
--- a/etc/udev/suse/50-udev-default.rules
+++ b/etc/udev/suse/50-udev-default.rules
@@ -1,22 +1,19 @@
 # console
-KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="vcs*",			GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="vcsa*",		GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="tty",			GROUP="tty", MODE="666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]*",		GROUP="tty", MODE="620", OPTIONS="last_rule"
-KERNEL=="console",		MODE="600", OPTIONS="last_rule"
-KERNEL=="ptmx",			GROUP="tty", MODE="666", OPTIONS="last_rule"
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[0-9]*|vcs*",	GROUP="tty", MODE="0620", OPTIONS="last_rule"
+KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
 
 # serial devices
-KERNEL=="tty[A-Z]*",		GROUP="uucp"
-KERNEL=="pppox*",		GROUP="uucp"
-KERNEL=="ircomm*",		GROUP="uucp"
-KERNEL=="modems/mwave*",	GROUP="uucp"
+KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
 KERNEL=="hvc*|hvsi*",		GROUP="uucp"
 KERNEL=="iseries/vtty*",	GROUP="uucp"
+KERNEL=="mwave",		NAME="modems/%k", GROUP="uucp"
 KERNEL=="ttyUSB*", ATTRS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
 KERNEL=="ttyUSB*", ATTRS{product}=="[Hh]andspring*Treo*|[Hh]andspring*Visor*", SYMLINK+="pilot"
+KERNEL=="ppp",			MODE="0600", OPTIONS+="ignore_remove"
 
 # video/graphics
 SUBSYSTEM=="video4linux",	GROUP="video"
@@ -34,11 +31,9 @@ KERNEL=="pmu",			GROUP="video"
 SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # input devices
-KERNEL=="mouse*|mice",		NAME="input/%k", MODE="0640"
-KERNEL=="event*",		NAME="input/%k", MODE="0640"
+KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
 KERNEL=="js*",			NAME="input/%k", MODE="0644"
-KERNEL=="ts*",			NAME="input/%k", MODE="0600"
-KERNEL=="uinput",		NAME="input/%k", MODE="0600"
+KERNEL=="ts*|uinput",		NAME="input/%k", MODE="0600"
 KERNEL=="lirc0",		SYMLINK+="lirc"
 
 # printer
@@ -57,46 +52,41 @@ KERNEL=="dv1394*",		SYMLINK+="dv1394/%n", GROUP="video"
 KERNEL=="video1394*",		SYMLINK+="video1394/%n", GROUP="video"
 
 KERNEL=="hw_random",		NAME="hwrng", SYMLINK+="%k"
-KERNEL=="mwave",		NAME="modems/%k"
 KERNEL=="rioctl",		NAME="specialix_rioctl", SYMLINK+="%k"
 KERNEL=="sxctl",		NAME="specialix_sxctl", SYMLINK+="%k"
 
 # network
-KERNEL=="tun",			NAME="net/%k", MODE="0600"
+KERNEL=="tun",			NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
 
 # misc devices
-KERNEL=="mem|kmem",		GROUP="kmem", MODE="640"
-KERNEL=="port",			GROUP="kmem", MODE="640"
-KERNEL=="nvram",		GROUP="kmem", MODE="600"
-KERNEL=="null",			MODE="666"
-KERNEL=="zero",			MODE="666"
-KERNEL=="full",			MODE="622"
-KERNEL=="random",		MODE="666"
-KERNEL=="urandom",		MODE="644"
-KERNEL=="rtc",			MODE="600"
+KERNEL=="mem|kmem|port",	GROUP="kmem", MODE="0640"
+KERNEL=="nvram",		GROUP="kmem", MODE="0600"
+KERNEL=="null|zero|random",	MODE="0666"
+KERNEL=="full",			MODE="0622"
+KERNEL=="urandom",		MODE="0644"
+KERNEL=="rtc",			MODE="0600"
+KERNEL=="fuse",			MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",		MODE="0600", GROUP="video"
-KERNEL=="djs*",			MODE="644"
-KERNEL=="sgi_*",		MODE="666"
-KERNEL=="rrom*",		MODE="400"
-KERNEL=="rflash*",		MODE="400"
-KERNEL=="usbscanner*",		MODE="644"
-KERNEL=="3270/ttycons*",	MODE="600"
-KERNEL=="3270/tub*",		MODE="666"
-KERNEL=="3270/tubcons*",	MODE="600"
-KERNEL=="ica",			MODE="666"
-KERNEL=="z90crypt",		MODE="666"
-KERNEL=="mmtimer",		MODE="644"
+KERNEL=="djs*",			MODE="0644"
+KERNEL=="sgi_*",		MODE="0666"
+KERNEL=="rrom*",		MODE="0400"
+KERNEL=="rflash*",		MODE="0400"
+KERNEL=="usbscanner*",		MODE="0644"
+KERNEL=="3270/ttycons*",	MODE="0600"
+KERNEL=="3270/tub*",		MODE="0666"
+KERNEL=="3270/tubcons*",	MODE="0600"
+KERNEL=="ica",			MODE="0666"
+KERNEL=="z90crypt",		MODE="0666"
+KERNEL=="mmtimer",		MODE="0644"
 KERNEL=="auer[0-9]*"		NAME="usb/%k"
 
 # packet writing interface
 KERNEL=="pktcdvd",		NAME="pktcdvd/control"
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/%k"
 
-# fix floppy devices
-KERNEL=="nvram", ACTION=="add", RUN+="load_floppy_module.sh"
-KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M $root/%k"
-KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/rm -f $root/%k*"
+# additional floppy devices (no sysfs entries)
+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G disk $root/%k"
 
 # block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
@@ -104,18 +94,12 @@ SUBSYSTEM=="block", GROUP="disk", MODE="0640"
 # sd:		0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
 # sr:		4 TYPE_WORM, 5 TYPE_ROM
 # st/osst:	1 TYPE_TAPE
-SUBSYSTEM=="scsi", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
-SUBSYSTEM=="scsi", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTR{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTR{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTR{type}=="1", RUN+="/sbin/modprobe st"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTR{type}=="[45]", RUN+="/sbin/modprobe sr_mod"
-SUBSYSTEM=="scsi_device", ACTION=="add", RUN+="/sbin/modprobe sg"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 
 # misc storage devices (non-block)
-KERNEL=="sg*",			GROUP="disk", MODE="640"
+KERNEL=="sg*",			GROUP="disk", MODE="0640"
 KERNEL=="st*|nst*",		GROUP="disk"
 KERNEL=="qft*|nqft*|zqft*|nzqft*|rawqft*|nrawqft", GROUP="disk"
 KERNEL=="ht*|nht*",		GROUP="disk"
@@ -124,14 +108,15 @@ KERNEL=="sch*",			GROUP="disk"
 KERNEL=="pt*|npt*",		GROUP="disk"
 KERNEL=="pg*",			GROUP="disk"
 KERNEL=="evms/block_device*",	GROUP="disk"
-KERNEL=="rawctl*|raw[0-9]*",	NAME="raw/%k", GROUP="disk"
+KERNEL=="rawctl*",		NAME="raw/%k", GROUP="disk"
+SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
 KERNEL=="osst*|nosst*",		NAME="%k", GROUP="disk"
 KERNEL=="iseries/vt*",		NAME="%k", GROUP="disk"
 KERNEL=="iseries/nvt*",		NAME="%k", GROUP="disk"
 KERNEL=="iseries/ibmsis*",	NAME="%k", GROUP="disk"
 
 # libusb device access
-SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 # kernel firmware loader
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"