X-Git-Url: https://hackdaworld.org/gitweb/?p=hdw-linux%2Fhdw-linux.git;a=blobdiff_plain;f=packages%2Fbase%2Fudev%2Fudev.rules;fp=packages%2Fbase%2Fudev%2Fudev.rules;h=df890c053de7ebc17149ed4b22c5ad0a02ea3377;hp=3c343411663b7866c0be557ddce9fd1fbe87984e;hb=793f79d0d200544e7193cdfd4b66dc2479bf7247;hpb=504579d0d381b02fc33fe1c696d64f96135a15a8

diff --git a/packages/base/udev/udev.rules b/packages/base/udev/udev.rules
index 3c34341..df890c0 100644
--- a/packages/base/udev/udev.rules
+++ b/packages/base/udev/udev.rules
@@ -1,5 +1,6 @@
 #
-# hdw-linux device naming rules for udev
+# hdw-linux udev rules
+#
 #
 
 # console
@@ -8,14 +9,14 @@ KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",	OPTI
 KERNEL=="vcs*",                 NAME="%k", GROUP="tty",			OPTIONS="last_rule"
 KERNEL=="vcsa*",                NAME="%k", GROUP="tty",			OPTIONS="last_rule"
 KERNEL=="tty",                  NAME="%k", GROUP="tty", MODE="0666",	OPTIONS="last_rule"
-KERNEL=="tty[0-9]",             NAME="vc/%n", GROUP="tty",			OPTIONS="last_rule"
-KERNEL=="tty[0-9][0-9]",        NAME="vc/%n", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty[0-9]",             NAME="%k", GROUP="tty",			OPTIONS="last_rule"
+KERNEL=="tty[0-9][0-9]",        NAME="%k", GROUP="tty",			OPTIONS="last_rule"
 KERNEL=="console",		NAME="%k", GROUP="tty", MODE="0600"
 KERNEL=="ptmx",			NAME="%k", GROUP="tty", MODE="0666"
 
 # tty devices
-KERNEL=="ttyS[0-9]*",	NAME="tts/%n", SYMLINK+="%k", GROUP="users"
-KERNEL=="ttyUSB[0-9]*",	NAME="tts/USB%n", GROUP="tty", MODE="0660"
+KERNEL=="ttyS[0-9]*",	NAME="%k", SYMLINK="tts/%n", GROUP="tty"
+KERNEL=="ttyUSB[0-9]*",	NAME="%k", SYMLINK="tts/USB%n", GROUP="tty", MODE="0660"
 KERNEL=="ippp0",	NAME="%k", GROUP="tty"
 KERNEL=="isdn*"		NAME="%k", GROUP="tty"
 KERNEL=="dcbri*",	NAME="%k", GROUP="tty"
@@ -25,13 +26,14 @@ KERNEL=="ircomm*",	NAME="%k", GROUP="tty"
 SUBSYSTEM=="block", GROUP="disk"
 
 # cdrom symlinks and other good cdrom naming
-BUS=="ide",	KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL="scd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
-ENV{ID_CDROM}=="?*",		SYMLINK+="cdrom%e", GROUP="cdrom"
-ENV{ID_CDROM_CD_RW}=="?*",	SYMLINK+="cdrw%e"
-ENV{ID_CDROM_DVD}=="?*",	SYMLINK+="dvd%e"
-ENV{ID_CDROM_DVD_R}=="?*",	SYMLINK+="dvdrw%e"
+BUS=="ide",	KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="sg[0-9]*", ACTION=="add", DRIVERS=="sr", GROUP="cdrom"
+ENV{ID_CDROM}=="?*",		PROGRAM="seq_node.sh %r %k cdrom", SYMLINK+="%c", GROUP="cdrom"
+ENV{ID_CDROM_CD_RW}=="?*",	PROGRAM="seq_node.sh %r %k cdrw",  SYMLINK+="%c"
+ENV{ID_CDROM_DVD}=="?*",	PROGRAM="seq_node.sh %r %k dvd",   SYMLINK+="%c"
+ENV{ID_CDROM_DVD_R}=="?*",	PROGRAM="seq_node.sh %r %k dvdrw", SYMLINK+="%c"
 
 # disk devices
 KERNEL=="sd*",		NAME="%k", GROUP="disk"
@@ -39,11 +41,11 @@ KERNEL=="dasd*",	NAME="%k", GROUP="disk"
 KERNEL=="ataraid*",	NAME="%k", GROUP="disk"
 
 # compaq smart array
-KERNEL=="cciss*",	PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
-KERNEL=="ida*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
+KERNEL=="cciss*",	NAME="%k"
+KERNEL=="ida*",		NAME="%k"
 
 # mylex
-KERNEL=="rd*",		PROGRAM="/etc/udev/scripts/raid-devfs.sh %k", NAME="%c{1}", SYMLINK+="%k"
+KERNEL=="rd*",		NAME="%k"
 
 # dri devices
 KERNEL=="card*",	NAME="dri/card%n", GROUP="video"
@@ -51,7 +53,7 @@ KERNEL=="nvidia*",	NAME="%k", GROUP="video"
 KERNEL=="3dfx*",	NAME="%k", GROUP="video"
 
 # alsa devices
-SUBSYSTEM=="sound", GROUP="users"
+SUBSYSTEM=="sound", GROUP="audio"
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
 KERNEL=="hw[CD0-9]*",		NAME="snd/%k"
 KERNEL=="pcm[CD0-9cp]*",	NAME="snd/%k"
@@ -72,7 +74,7 @@ KERNEL=="microcode",	NAME="cpu/microcode"
 KERNEL=="dm-[0-9]*",	OPTIONS="ignore_device"
 # create a symlink named after the device map name
 # note devmap_name comes with extras/multipath
-#KERNEL=="dm-[0-9]*",	PaudioROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
+#KERNEL=="dm-[0-9]*",	PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
 KERNEL=="device-mapper",	NAME="mapper/control"
 
 # fb devices
@@ -124,7 +126,7 @@ KERNEL=="dnrtmsg",	NAME="netlink/%k"
 KERNEL=="tap*",		NAME="netlink/%k"
 
 # network devices
-KERNEL=="tun",		NAME="net/%k"
+KERNEL=="tun",		NAME="net/%k",	MODE="0600"
 
 # ramdisk devices
 KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
@@ -139,16 +141,16 @@ 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="users"
-KERNEL=="adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="audio",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="dsp",			NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="mixer",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="sequencer",		NAME="sound/%k", SYMLINK+="%k", GROUP="users"
-KERNEL=="sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="users"
+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"
 
 # memory devices
 KERNEL=="random",	NAME="%k", MODE="0666"
@@ -169,12 +171,12 @@ 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"
-KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", GROUP="video"
+KERNEL=="radio[0-9]*",	NAME="v4l/radio%n", SYMLINK+="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"
 
 # dvb devices
-KERNEL=="dvb*", PROGRAM="/etc/udev/scripts/dvb.sh %k", NAME="%c", GROUP="video", MODE="0660"
+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
 
 # Asterisk Zaptel devices
 KERNEL=="zapctl",	NAME="zap/ctl"
@@ -201,6 +203,7 @@ KERNEL=="lp*",		NAME="%k", GROUP="lp"
 KERNEL=="irlpt",	NAME="%k", GROUP="lp"
 KERNEL=="usblp",	NAME="%k", GROUP="lp"
 KERNEL=="lp*",		NAME="%k", GROUP="lp"
+KERNEL=="parport*",	NAME="%k", GROUP="lp"
 
 # tape devices
 KERNEL=="ht*",		NAME="%k", GROUP="tape"
@@ -232,67 +235,42 @@ KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
 KERNEL=="umad*",	NAME="infiniband/%k"
 KERNEL=="issm*",	NAME="infiniband/%k"
 
-# tpm devices
-KERNEL=="tpm*",	NAME="%k", OWNER="tss", GROUP="tss", MODE="0600"
-
-#######################################
-# Persistant block device stuff - begin
-#######################################
-
-# Skip all of this if we are not adding a block device
-ACTION!="add",		GOTO="persistent_end"
-SUBSYSTEM!="block",	GOTO="persistent_end"
-
-# skip accessing removable ide devices, cause the ide drivers are horrible broken
-BUS=="ide", SYSFS{removable}="1", GOTO="no_volume_id"
-BUS=="ide", SYSFS{../removable}="1", GOTO="no_volume_id"
-
-# persistent disk device links /dev/disk/
-KERNEL=="hd*[!0-9]", IMPORT="/sbin/ata_id --export $tempnode"
-KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
-KERNEL=="hd*[0-9]", IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
-
-KERNEL=="sd*[!0-9]", SYSFS{ieee1394_id}=="*", IMPORT="/bin/echo -e 'ID_SERIAL=$sysfs{ieee1394_id}\nID_BUS=ieee1394'"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/usb_id -x"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -s %p"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="", IMPORT="/sbin/scsi_id -g -x -a -s %p"
-KERNEL=="sd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
-KERNEL=="sd*[0-9]", IMPORT{parent}=="ID_*"
-KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
-
-# Skip id for ram / loop / fd
-KERNEL=="ram*", GOTO="no_volume_id"
-KERNEL=="loop*", GOTO="no_volume_id"
-KERNEL=="fd*", GOTO="no_volume_id"
-
-KERNEL=="*[!0-9]", ENV{ID_TYPE}=="?*", IMPORT="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
-KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
-
-# volume-label/uuid
-KERNEL=="*[!0-9]", SYSFS{removable}=="1", GOTO="no_volume_id"
-KERNEL=="sr*", GOTO="no_volume_id"
-KERNEL=="*[0-9]", IMPORT="/sbin/vol_id --export $tempnode"
-KERNEL=="*[0-9]", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-KERNEL=="*[0-9]", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
-LABEL="no_volume_id"
-
-LABEL="persistent_end"
-
-#####################################
-# Persistant block device stuff - end
-#####################################
 
 # usbfs-like device nodes
-SUBSYSTEM="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c"
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
+
+
+# Module autoloading
+
+# Autoload modules that lack aliases but have them defined inutoload modules
+SYSFS{modalias}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# /etc/modprobe.conf.
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'"
+# If you have problems with some pnp modules being loaded, please enter the
+# following aliases into the modprobe configuration files.  These are needed by
+# udev to autoload some modules
+# alias pnp:dPNP0510 irtty-sir
+# alias pnp:dPNP0511 irtty-sir
+# alias pnp:dPNP0700 floppy
+# alias pnp:dPNP0800 pcspkr
+# alias pnp:dPNP0b00 rtc
+# alias pnp:dPNP0303 atkbd
+# alias pnp:dPNP0f13 psmouse
+# alias pnp:dPNPb02f analog
+
+
+
+# Load firmware
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
 
 
 # be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
 # run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
-ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"
+ENV{UDEVD_EVENT}=="1", RUN+="udev_run_hotplugd $env{SUBSYSTEM}"
 
 # always run /etc/dev.d/ stuff for now.
-RUN+="/sbin/udev_run_devd"
+RUN+="udev_run_devd $env{SUBSYSTEM}"
 
 # debugging monitor
 RUN+="socket:/org/kernel/udev/monitor"