[arch-commits] CVS update of core/base/udev (5 files)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 9 22:17:47 UTC 2008
Date: Sunday, March 9, 2008 @ 18:17:47
Author: tpowa
Path: /home/cvs-core/core/base/udev
Added: 40-arch.rules (1.1) arch-udev-rules.patch (1.1)
Modified: PKGBUILD (1.156 -> 1.157) cdrom-rules.patch (1.1 -> 1.2)
readme-udev-arch.txt (1.10 -> 1.11)
'upgpkg: only commit no tag, added new splitted udev rules'
-----------------------+
40-arch.rules | 191 ++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 48 ++++++------
arch-udev-rules.patch | 134 +++++++++++++++++++++++++++++++++
cdrom-rules.patch | 4 -
readme-udev-arch.txt | 2
5 files changed, 354 insertions(+), 25 deletions(-)
Index: core/base/udev/40-arch.rules
diff -u /dev/null core/base/udev/40-arch.rules:1.1
--- /dev/null Sun Mar 9 18:17:47 2008
+++ core/base/udev/40-arch.rules Sun Mar 9 18:17:46 2008
@@ -0,0 +1,191 @@
+# Udev rules for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
+# do not edit this file, it will be overwritten on update
+#
+# This ruleset should provide a DevFS-compatible device tree.
+#
+# There are a number of modifiers that are allowed to be used in some
+# of the different fields. They provide the following subsitutions:
+#
+# %n the "kernel number" of the device.
+# For example, 'sda3' has a "kernel number" of '3'
+# %k the kernel name for the device.
+# %M the kernel major number for the device
+# %m the kernel minor number for the device
+# %b the bus id for the device
+# %c the string returned by the PROGRAM
+# %s{filename} the content of a sysfs attribute.
+# %% the '%' char itself.
+#
+# There are a number of modifiers that are allowed to be used in some of the
+# fields. See the udev man page for a full description of them.
+# global stuff
+#
+
+#####################################
+###### Hotplug rules - begin
+#####################################
+# check if the device has already been claimed by a driver
+ACTION!="add", GOTO="drivers_end"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
+
+# SCSI addon modules
+SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
+
+# SOUND addon modules
+SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss"
+SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss"
+
+#PNP addon modules
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0b00", RUN+="/lib/udev/load-modules.sh rtc_cmos"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0510*", RUN+="/lib/udev/load-modules.sh irtty-sir"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0511*", RUN+="/lib/udev/load-modules.sh irtty-sir"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0501", RUN+="/lib/udev/load-modules.sh ppp-generic"
+
+# PARPORT addon modules
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev"
+
+# fix ide cdrom detection on old proliant servers
+SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic"
+
+LABEL="drivers_end"
+#####################################
+##### Hotplug rules - end
+#####################################
+
+#####################################
+###### CD/DVD symlinks - begin
+#####################################
+ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode"
+ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode"
+ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b"
+ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b"
+ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b"
+ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvd-%b"
+ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh"
+ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
+ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
+ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh"
+ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh"
+ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh"
+#####################################
+###### CD/DVD symlinks - end
+#####################################
+
+#####################################
+# Permissions and Symlinks - begin
+#####################################
+# fix /dev/root symlink
+SUBSYSTEM=="block", RUN+="root-link.sh"
+
+# permissions for IDE CD devices
+SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical"
+
+# permissions for SCSI CD devices
+SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical"
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical"
+
+# permissions for removable devices like cardreaders or sticks
+KERNEL=="sd*", ATTRS{scsi_level}=="0", ATTRS{type}=="0", GROUP="storage"
+
+# permissions for firewire external drives
+KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage"
+
+# permissions for usb to scsi external adapters
+KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage"
+
+# permissions for ide storage like pcmcia card readers
+ACTION!="add", GOTO="pcmcia_end"
+SUBSYSTEM!="block", GOTO="pcmcia_end"
+KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
+KERNEL=="hd*", IMPORT{parent}=="ID_*"
+KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage"
+LABEL="pcmcia_end"
+
+# permissions for SCSI scanners
+SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner"
+
+# md block devices
+KERNEL=="md[0-9]*", NAME="md%n", SYMLINK+="md/%n"
+
+# video devices
+SUBSYSTEM=="video4linux", GROUP="video"
+### xorg resets those permissions, adjust your xorg.conf!
+KERNEL=="nvidia*", GROUP="video"
+KERNEL=="3dfx*", GROUP="video"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k"
+
+# loop devices
+KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k"
+
+# misc
+KERNEL=="nvram", NAME="misc/%k", SYMLINK+="%k", GROUP="kmem", MODE="0640"
+KERNEL=="psaux", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="uinput", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="sgi_fetchop", MODE="0666"
+KERNEL=="sonypi", MODE="0666"
+KERNEL=="inotify", NAME="misc/%k", SYMLINK+="%k", MODE="0666"
+
+# sound devices
+# alsa devices
+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"
+KERNEL=="midi[CD0-9]*", NAME="snd/%k"
+KERNEL=="timer", NAME="snd/%k"
+KERNEL=="seq", NAME="snd/%k"
+# oss devices
+KERNEL=="audio*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="dmmidi*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="admmidi*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="dsp*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="adsp*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="midi*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="amidi*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="mixer*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="sequencer*", NAME="sound/%k", SYMLINK+="%k"
+
+# USB devices
+KERNEL=="hiddev*", NAME="usb/%k"
+KERNEL=="legousbtower*", NAME="usb/%k", MODE="0666"
+KERNEL=="dabusb*", NAME="usb/%k"
+
+# netlink devices
+KERNEL=="route", NAME="netlink/%k"
+KERNEL=="skip", NAME="netlink/%k"
+KERNEL=="usersock", NAME="netlink/%k"
+KERNEL=="fwmonitor", NAME="netlink/%k"
+KERNEL=="tcpdiag", NAME="netlink/%k"
+KERNEL=="nflog", NAME="netlink/%k"
+KERNEL=="xfrm", NAME="netlink/%k"
+KERNEL=="arpd", NAME="netlink/%k"
+KERNEL=="route6", NAME="netlink/%k"
+KERNEL=="ip6_fw", NAME="netlink/%k"
+KERNEL=="dnrtmsg", NAME="netlink/%k"
+### ! disabled seems to break device creation !
+# KERNEL=="tap*", NAME="netlink/%k"
+
+# CAPI devices
+KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
+KERNEL=="capi*", NAME="capi/%n", GROUP="uucp"
+
+# IEEE1394 (firewire) devices
+KERNEL=="raw1394", NAME="%k", GROUP="video"
+
+# kbd devices
+KERNEL=="kbd", MODE="0664"
+
+#######################################
+# Permissions and Symlinks - end
+#######################################
Index: core/base/udev/PKGBUILD
diff -u core/base/udev/PKGBUILD:1.156 core/base/udev/PKGBUILD:1.157
--- core/base/udev/PKGBUILD:1.156 Fri Mar 7 16:59:38 2008
+++ core/base/udev/PKGBUILD Sun Mar 9 18:17:46 2008
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD,v 1.156 2008/03/07 21:59:38 aaron Exp $
-# Maintainer: ???
+# $Id: PKGBUILD,v 1.157 2008/03/09 22:17:46 tpowa Exp $
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=udev
pkgver=118
-pkgrel=4
+pkgrel=5
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -11,54 +12,57 @@
depends=('glibc' 'coreutils' 'util-linux')
install=udev.install
backup=(etc/udev/udev.conf
- etc/udev/rules.d/udev.rules
etc/scsi_id.config
etc/udev/cdsymlinks.conf)
conflicts=('pcmcia-cs' 'hotplug')
replaces=('devfsd')
options=(!makeflags)
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
- migrate-udev start_udev udev.rules load-modules.sh
- cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt)
-md5sums=('39ab2404464c7026c65eb878827192b9'
- '49434a593918c822077bc3af765f1aff'
- 'a68a519d1ed8cbbd2f45c23eb32ea218'
- 'bb2b9745f602328a75972d75693ac4ea'
- 'c56abe3b3d93281f50d1d860e5c832a6'
- '12d3ab1283c56beb903afcab11789037'
- '8424b78e9dd772e75b4ef90814807815'
- '2d6dc6842464f107bccc68cd505a6c31'
- 'f01c60661e4b32ca7c7f905c1e194a52')
+ migrate-udev start_udev 40-arch.rules load-modules.sh
+ cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch framebuffer)
build() {
cd $startdir/src/$pkgname-$pkgver
make || return 1
make INSTALL=/bin/install DESTDIR=$startdir/pkg install \
EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id extras/firmware extras/floppy extras/scsi_id extras/usb_id extras/volume_id extras/path_id extras/rule_generator"
- # remove udev default files
- rm -f $startdir/pkg/etc/udev/rules.d/{05-udev-early.rules,50-udev-default.rules,60-persistent-storage.rules,61-persistent-storage-edd.rules,60-persistent-input.rules,80-drivers.rules,95-udev-late.rules}
+
install -D -m755 extras/path_id/path_id $startdir/pkg/sbin/path_id
install -D -m755 $startdir/src/start_udev $startdir/pkg/etc/start_udev
install -D -m755 $startdir/src/migrate-udev $startdir/pkg/sbin/migrate-udev
- install -D -m644 $startdir/src/udev.rules $startdir/pkg/etc/udev/rules.d/udev.rules
- # install out module loading subsystem
- install -D -m755 $startdir/src/load-modules.sh $startdir/pkg/lib/udev/load-modules.sh
+ install -D -m644 $startdir/src/40-arch.rules $startdir/pkg/etc/udev/rules.d/40-arch.rules
+ # install our module loading subsystem
+ install -D -m755 $startdir/src/load-modules.sh $startdir/pkg/lib/udev/load-modules.sh
# install cdsymlinks.sh
- install -D -m755 $startdir/src/cdsymlinks.sh $startdir/pkg/lib/udev/cdsymlinks.sh
+ install -D -m755 $startdir/src/cdsymlinks.sh $startdir/pkg/lib/udev/cdsymlinks.sh
# install root-link.sh
- install -D -m755 $startdir/src/root-link.sh $startdir/pkg/lib/udev/root-link.sh
+ install -D -m755 $startdir/src/root-link.sh $startdir/pkg/lib/udev/root-link.sh
# install instructions
install -D -m644 $startdir/src/readme-udev-arch.txt $startdir/pkg/etc/udev/readme-udev-arch.txt
# add devices dir
mkdir $startdir/pkg/lib/udev/devices
# disable error loggin to prevent startup failures printed to vc on boot
sed -i -e 's|udev_log="err"|udev_log="0"|g' $startdir/pkg/etc/udev/udev.conf
+ # install additional rules files
+ install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/40-pilot-links.rules $startdir/pkg/etc/udev/rules.d/
+ install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/64-device-mapper.rules $startdir/pkg/etc/udev/rules.d/
+ install -D -m 644 $startdir/src/$pkgname-$pkgver/etc/udev/packages/64-md-raid.rules $startdir/pkg/etc/udev/rules.d/
# fix 60-cdrom_id.rules
cd $startdir/pkg/etc/udev/rules.d/
patch -Np0 -i $startdir/src/cdrom-rules.patch || return 1
+ # fix standard udev rules to fit to arch
+ patch -Np0 -i $startdir/src/arch-udev-rules.patch || return 1
+ # fix program paths in rules files
+ for i in vol_id cdrom_id ata_id scsi_id path_id edd_id; do
+ sed -i -e "s#$i#/lib/udev/$i#g" $startdir/pkg/etc/udev/rules.d/*
+ done
+ # fix modprobe rules to use the load-modules.sh
+ sed -i -e "s#/sbin/modprobe#/lib/udev/load-modules.sh#g" $startdir/pkg/etc/udev/rules.d/*
# disable persistent cdromsymlinks and network by default
mv $startdir/pkg/etc/udev/rules.d/75-persistent-net-generator.rules \
$startdir/pkg/etc/udev/rules.d/75-persistent-net-generator.rules.optional
mv $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules \
$startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
+ # add framebuffer blacklist
+ install -D -m644 $startdir/src/framebuffer $startdir/pkg/etc/modprobe.d/framebuffer
}
Index: core/base/udev/arch-udev-rules.patch
diff -u /dev/null core/base/udev/arch-udev-rules.patch:1.1
--- /dev/null Sun Mar 9 18:17:47 2008
+++ core/base/udev/arch-udev-rules.patch Sun Mar 9 18:17:47 2008
@@ -0,0 +1,134 @@
+--- 50-udev-default.rules.old 2008-03-09 17:52:59.000000000 +0100
++++ 50-udev-default.rules 2008-03-09 17:09:50.000000000 +0100
+@@ -4,13 +4,18 @@
+ KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS="last_rule"
+ KERNEL=="ptmx", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+ KERNEL=="tty", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+-KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620", OPTIONS="last_rule"
+-KERNEL=="vcs|vcs[0-9]*|vcsa|vcsa[0-9]*", GROUP="tty", OPTIONS="last_rule"
++KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620", NAME="vc/%n", SYMLINK+="%k" OPTIONS="last_rule"
++KERNEL=="vcs", GROUP="tty", NAME="vcc/0", OPTIONS="last_rule"
++KERNEL=="vcs[0-9]*", GROUP="tty", NAME="vcc/%n", OPTIONS="last_rule"
++KERNEL=="vcsa", GROUP="tty", NAME="vcc/a0", OPTIONS="last_rule"
++KERNEL=="vcsa[0-9]*", GROUP="tty", NAME="vcc/a%n", OPTIONS="last_rule"
+ KERNEL=="console", MODE="0600", OPTIONS="last_rule"
+ KERNEL=="tty0", SYMLINK+="systty"
+
+ # serial
+ KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
++KERNEL=="ttyS[0-9]*", NAME="tts/%n", SYMLINK+="ttyS%n"
++KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK+="%k"
+ KERNEL=="ppp", MODE="0600", OPTIONS+="ignore_remove"
+ KERNEL=="mwave", NAME="modems/mwave", GROUP="uucp"
+ KERNEL=="hvc*|hvsi*", GROUP="uucp"
+@@ -20,8 +25,7 @@
+ KERNEL=="null|zero|full|random|urandom", MODE="0666"
+ KERNEL=="null", SYMLINK+="XOR"
+ KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
+-KERNEL=="ram0", SYMLINK+="ramdisk"
+-KERNEL=="ram1", SYMLINK+="ram"
++KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
+
+ # input
+ KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640"
+@@ -30,23 +34,30 @@
+
+ # video4linux
+ KERNEL=="vbi0", SYMLINK+="vbi"
++KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video"
+ KERNEL=="radio0", SYMLINK+="radio"
++KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video"
+ KERNEL=="video0", SYMLINK+="video"
++KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k", GROUP="video"
++KERNEL=="vtx0", SYMLINK+="vtx"
++KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", SYMLINK+="%k", GROUP="video"
+
+ # graphics
+-KERNEL=="agpgart", MODE="0600"
+-KERNEL=="card[0-9]*", NAME="dri/%k", MODE="0666"
++### xorg resets those permissions, adjust your xorg.conf!
++KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k", GROUP="video", MODE="0600"
++KERNEL=="card[0-9]*", NAME="dri/%k", GROUP="video", MODE="0666"
++KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+ KERNEL=="fb0", SYMLINK+="fb"
+
+ # DVB video
+-SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
+
+ # Firewire
+-KERNEL=="dv1394*", SYMLINK+="dv1394/%n"
+-KERNEL=="video1394*", NAME="video1394/%n"
++KERNEL=="dv1394*", SYMLINK+="dv1394/%n", GROUP="video"
++KERNEL=="video1394*", NAME="video1394/%n", GROUP="video"
+
+ # firmware class requests
+-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
++SUBSYSTEM=="firmware", ACTION=="add", ENV{FIRMWARE}=="?*", RUN+="firmware.sh"
+
+ # libusb device nodes
+ SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
+@@ -59,23 +70,20 @@
+ KERNEL=="irlpt[0-9]*", GROUP="lp"
+
+ # block, tapes, block-releated
+-SUBSYSTEM=="block", GROUP="disk", MODE="0640"
+-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
++SUBSYSTEM=="block", GROUP="disk"
+ 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"
+-KERNEL=="fd[0-9]", GROUP="floppy"
+-KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
++KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
++KERNEL=="fd[0-9]*", NAME="fd%n", SYMLINK+="floppy/%n fd%nu1440 fd%nu720 fd%nh1200 fd%nu360", GROUP="floppy"
+ KERNEL=="sch[0-9]*", GROUP="disk"
+-KERNEL=="sg[0-9]*", GROUP="disk", MODE="0640"
+ KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="disk"
+ KERNEL=="pg[0-9]*", GROUP="disk"
+ KERNEL=="pt[0-9]*|npt[0-9]*", GROUP="disk"
+ KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk"
+ KERNEL=="rawctl", NAME="raw/%k", GROUP="disk"
+ SUBSYSTEM=="raw", KERNEL=="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k"
+-KERNEL=="pktcdvd", NAME="pktcdvd/control"
++KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="optical", MODE="0660"
++KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660"
+ KERNEL=="qft0", SYMLINK+="ftape"
+ SUBSYSTEM=="bsg", NAME="bsg/%k"
+ SUBSYSTEM=="aoe", NAME="etherd/%k", GROUP="disk"
+@@ -84,13 +92,13 @@
+ KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
+
+ # CPU
+-KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid"
+-KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
++KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid", SYMLINK="%k"
++KERNEL=="msr[0-9]*", NAME="cpu/%n/msr", SYMLINK="%k"
+ KERNEL=="microcode", NAME="cpu/microcode", MODE="0600"
+
+ # miscellaneous
+ KERNEL=="fuse", MODE="0666"
+-KERNEL=="rtc|rtc0", MODE="0644"
++KERNEL=="rtc*", NAME="misc/%k", SYMLINK+="%k", GROUP="audio", MODE="0664"
+ KERNEL=="rtc0", SYMLINK+="rtc"
+ KERNEL=="auer[0-9]*", NAME="usb/%k"
+ KERNEL=="hw_random", NAME="hwrng", SYMLINK+="%k"
+--- 60-persistent-storage.rules.old 2008-03-09 17:52:59.000000000 +0100
++++ 60-persistent-storage.rules 2008-03-09 15:05:13.000000000 +0100
+@@ -3,11 +3,13 @@
+ # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path}
+ # scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
+
+-ACTION!="add", GOTO="persistent_storage_end"
++# needed like this!!!
++ACTION!="add|change", GOTO="persistent_storage_end"
+ SUBSYSTEM!="block", GOTO="persistent_storage_end"
+
+ # skip rules for inappropriate block devices
+-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
++# don't add dm-*!!!
++KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end"
+
+ # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
Index: core/base/udev/cdrom-rules.patch
diff -u core/base/udev/cdrom-rules.patch:1.1 core/base/udev/cdrom-rules.patch:1.2
--- core/base/udev/cdrom-rules.patch:1.1 Thu Sep 28 07:57:03 2006
+++ core/base/udev/cdrom-rules.patch Sun Mar 9 18:17:47 2008
@@ -4,5 +4,5 @@
# import optical drive properties
-KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
-+KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="/lib/udev/cdrom_id --export $tempnode"
-+KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="/lib/udev/path_id %p"
++KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
++KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", IMPORT{program}="path_id %p"
Index: core/base/udev/readme-udev-arch.txt
diff -u core/base/udev/readme-udev-arch.txt:1.10 core/base/udev/readme-udev-arch.txt:1.11
--- core/base/udev/readme-udev-arch.txt:1.10 Wed Sep 20 06:47:31 2006
+++ core/base/udev/readme-udev-arch.txt Sun Mar 9 18:17:47 2008
@@ -113,7 +113,7 @@
- To enable this feature copy in /etc/udev/rules.d
75-cd-aliases-generator.rules.optinal
to 75-cd-aliases-generator.rules
- Also disable this part in /etc/udev/rules.d/udev.rules by putting a # in front:
+ Also disable this part in /etc/udev/rules.d/40-arch.rules by putting a # in front:
--- snip
ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="/lib/udev/cdsymlinks.sh"
ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="/lib/udev/cdsymlinks.sh"
More information about the arch-commits
mailing list