[arch-commits] Commit in udev/trunk (5 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Mar 7 14:48:09 UTC 2009
Date: Saturday, March 7, 2009 @ 09:48:09
Author: tpowa
Revision: 29265
'update to latest version'
Modified:
udev/trunk/81-arch.rules
udev/trunk/PKGBUILD
udev/trunk/arch-udev-rules.patch
udev/trunk/udev.install
Deleted:
udev/trunk/start_udev
-----------------------+
81-arch.rules | 89 +++++++++++++++++++--------
PKGBUILD | 13 ++--
arch-udev-rules.patch | 156 ++++++++++++++++--------------------------------
start_udev | 137 ------------------------------------------
udev.install | 41 +++++++++---
5 files changed, 156 insertions(+), 280 deletions(-)
Modified: 81-arch.rules
===================================================================
--- 81-arch.rules 2009-03-07 14:47:54 UTC (rev 29264)
+++ 81-arch.rules 2009-03-07 14:48:09 UTC (rev 29265)
@@ -80,6 +80,9 @@
# fix /dev/root symlink
SUBSYSTEM=="block", RUN+="root-link.sh"
+# permission for sg devices
+KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
+
# permissions for IDE CD devices
SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical"
@@ -88,7 +91,7 @@
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"
+KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage"
# permissions for firewire external drives
KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage"
@@ -107,14 +110,40 @@
# permissions for SCSI scanners
SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner"
+# consoles
+KERNEL=="tty[0-9]*", NAME="vc/%n", SYMLINK+="%k"
+KERNEL=="vcs", NAME="vcc/0"
+KERNEL=="vcs[0-9]*", NAME="vcc/%n"
+KERNEL=="vcsa", NAME="vcc/a0"
+KERNEL=="vcsa[0-9]*" NAME="vcc/a%n"
+
+# serial
+KERNEL=="ttyS[0-9]*", NAME="tts/%n", SYMLINK+="ttyS%n"
+KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK+="%k"
+
# md block devices
KERNEL=="md[0-9]*", NAME="md%n", SYMLINK+="md/%n"
+# mem
+KERNEL=="ram0", SYMLINK+="ramdisk"
+KERNEL=="ram1", SYMLINK+="ram"
+KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
+
+# video4linux
+KERNEL=="vbi0", SYMLINK+="vbi"
+KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK+="%k"
+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"
+KERNEL=="vtx0", SYMLINK+="vtx"
+KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", SYMLINK+="%k"
+
# video devices
-SUBSYSTEM=="video4linux", GROUP="video"
### xorg resets those permissions, adjust your xorg.conf!
-KERNEL=="nvidia*", GROUP="video"
KERNEL=="3dfx*", GROUP="video"
+KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video"
# i2c devices
KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k"
@@ -123,53 +152,59 @@
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"
+KERNEL=="nvram", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="psaux", NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="uinput", 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"
# 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"
+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=="amidi*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="mixer*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="sequencer*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="aload*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="amixer*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="music", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="dmfm*", NAME="sound/%k", SYMLINK+="%k"
+KERNEL=="midi[0-9]*", NAME="sound/%k", SYMLINK+="%k
# USB devices
-KERNEL=="hiddev*", NAME="usb/%k"
-KERNEL=="legousbtower*", NAME="usb/%k", MODE="0666"
-KERNEL=="dabusb*", NAME="usb/%k"
+KERNEL=="legousbtower*", MODE="0666"
# netlink devices
-KERNEL=="route", NAME="netlink/%k"
+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=="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"
+# KERNEL=="tap*", NAME="netlink/%k"
# IEEE1394 (firewire) devices
KERNEL=="raw1394", NAME="%k", GROUP="video"
# kbd devices
-KERNEL=="kbd", MODE="0664"
+KERNEL=="kbd", MODE="0664"
+# CPU
+KERNEL=="cpu[0-9]*", SYMLINK="%k"
+KERNEL=="msr[0-9]*", SYMLINK="%k"
+
+# miscellaneous
+KERNEL=="rtc|rtc0", NAME="misc/%k", SYMLINK+="%k", GROUP="audio", MODE="0664"
#######################################
# Permissions and Symlinks - end
#######################################
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-07 14:47:54 UTC (rev 29264)
+++ PKGBUILD 2009-03-07 14:48:09 UTC (rev 29265)
@@ -3,7 +3,7 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
# Maintainer: Thomas Bächler <thomas at archlinux.org>
pkgname=udev
-pkgver=135
+pkgver=139
pkgrel=1
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
@@ -25,13 +25,13 @@
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
arch-udev-rules.patch readme-udev-arch.txt)
-md5sums=('661b9df34e1304dad10f595d95b472bb'
- '3a955ca8e2122a48a223f9d8adf87b70'
+md5sums=('7e705e237d29734c77bc26f6ccbc4594'
+ '1aa06a1133e102dd3567331838913246'
'f4951f61438d69894b728212dac7318b'
- 'fca04a608009069beb786e26338a783b'
+ 'e0d7ab73ec42eb81947daf23e224c0fb'
'8424b78e9dd772e75b4ef90814807815'
'2d6dc6842464f107bccc68cd505a6c31'
- 'ae216c26a6a5cae4a3ef9c0e1f7bfaa6'
+ '80b7e3697d19360c9783d612a2fb16fc'
'7fc6d33bb218e752302eef0a80ff0a89')
build() {
@@ -62,6 +62,9 @@
# add devices dir
mkdir $pkgdir/lib/udev/devices
+ # create shm and pts directory
+ mkdir $pkgdir/lib/udev/devices/pts
+ mkdir $pkgdir/lib/udev/devices/shm
# disable error logging to prevent startup failures printed to vc on boot
sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf
# install additional rules files
Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch 2009-03-07 14:47:54 UTC (rev 29264)
+++ arch-udev-rules.patch 2009-03-07 14:48:09 UTC (rev 29265)
@@ -5,132 +5,84 @@
SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices
--KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
-+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
+-KERNEL=="ram*|fd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
++KERNEL=="ram*|fd*|nbd*|gnbd*|md*|btibm*", 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"
diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
--- rules.d/80-drivers.rules 2008-09-12 15:59:57.000000000 +0200
+++ rules.d.arch/80-drivers.rules 2008-09-12 16:01:56.000000000 +0200
-@@ -2,14 +2,16 @@
+@@ -2,15 +2,16 @@
ACTION!="add", GOTO="drivers_end"
--DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
--SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
--SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
--SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
--SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
--SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
--SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
--SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev"
+-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe -b $env{MODALIAS}"
+-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
+-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
+-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
+-SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block"
+-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
+-SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
+-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
+-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
-+SUBSYSTEM=="tifm", RUN+="/lib/udev/load-modules.sh tifm_sd"
-+SUBSYSTEM=="tifm", RUN+="/lib/udev/load-modules.sh tifm_ms"
++SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
++SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
+SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
-+SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/lib/udev/load-modules.sh ide-scsi"
++SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/lib/udev/load-modules.sh ch"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
LABEL="drivers_end"
-diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
---- rules.d/50-udev-default.rules 2008-09-12 15:59:57.000000000 +0200
-+++ rules.d.arch/50-udev-default.rules 2008-09-12 16:00:50.000000000 +0200
-@@ -4,12 +4,17 @@
- 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"
+--- rules.d/50-udev-default.rules~ 2009-01-15 17:04:59.000000000 +0100
++++ rules.d/50-udev-default.rules 2009-03-07 13:23:42.000000000 +0100
+@@ -12,10 +12,10 @@
+ KERNEL=="console", MODE="0600"
# 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"
-@@ -21,6 +26,7 @@
- KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
- KERNEL=="ram0", SYMLINK+="ramdisk"
- KERNEL=="ram1", SYMLINK+="ram"
-+KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
+-KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="dialout"
++KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*", GROUP="uucp"
+ KERNEL=="ppp", MODE="0600"
+-KERNEL=="mwave", NAME="modems/mwave", GROUP="dialout"
+-KERNEL=="hvc*|hvsi*", GROUP="dialout"
++KERNEL=="mwave", NAME="modems/mwave", GROUP="uucp"
++KERNEL=="hvc*|hvsi*", GROUP="uucp"
- # input
- KERNEL=="mouse*|mice|event*", NAME="input/%k", MODE="0640"
-@@ -36,13 +36,18 @@
- KERNEL=="vtx*|vbi*", GROUP="video"
- KERNEL=="winradio*", GROUP="video"
- KERNEL=="vbi0", SYMLINK+="vbi"
--KERNEL=="radio0", SYMLINK+="radio"
-+KERNEL=="vbi[0-9]*", NAME="v4l/vbi%n", SYMLINK+="%k"
-+KERNEL=="radio0", SYMLINK+="video"
-+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"
-+KERNEL=="vtx0", SYMLINK+="vtx"
-+KERNEL=="vtx[0-9]*", NAME="v4l/vtx%n", SYMLINK+="%k"
+ # mem
+ KERNEL=="null|zero|full|random|urandom", MODE="0666"
+@@ -64,20 +64,20 @@
- # graphics
--KERNEL=="agpgart", MODE="0600", GROUP="video"
--KERNEL=="card[0-9]*", NAME="dri/%k", MODE="0666"
--KERNEL=="fb0", SYMLINK+="fb"
-+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=="pmu", GROUP="video"
- KERNEL=="nvidia*|nvidiactl*", GROUP="video"
- SUBSYSTEM=="graphics", GROUP="video"
-@@ -62,19 +73,19 @@
- # block, tapes, block-releated
- SUBSYSTEM=="block", GROUP="disk"
- SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
--KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-+KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
- KERNEL=="fd[0-9]", GROUP="floppy"
+ # floppy
+ 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"
+KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/%k"
- KERNEL=="sch[0-9]*", GROUP="disk"
--KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0640"
-+KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
- 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"
-@@ -83,13 +94,13 @@
- KERNEL=="tun", NAME="net/%k", MODE="0666", OPTIONS+="ignore_remove"
++KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
- # 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"
+ # cdrom
+-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
+-SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom"
+-SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
+-KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom"
+-KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom"
++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
++SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="optical", MODE="0660"
++SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
++KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="optical", MODE="0660"
++KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="optical", MODE="0660"
- # miscellaneous
- KERNEL=="fuse", MODE="0666"
--KERNEL=="rtc|rtc0", MODE="0644"
-+KERNEL=="rtc|rtc0", 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"
+ # tape
+-KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
+-KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
+-SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
++KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660"
++KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
++SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
+
+ # block-releated
+ KERNEL=="sch[0-9]*", GROUP="disk"
Deleted: start_udev
===================================================================
--- start_udev 2009-03-07 14:47:54 UTC (rev 29264)
+++ start_udev 2009-03-07 14:48:09 UTC (rev 29265)
@@ -1,137 +0,0 @@
-#! /bin/sh
-#
-# start_udev
-# script to initialize /dev by using udev.
-#
-# Modified for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
-#
-# Inspired by:
-#
-# Copyright (C) 2004 Greg Kroah-Hartman <greg at kroah.com>
-#
-# Released under the GPL v2 only.
-#
-# This needs to be run at the earliest possible point in the boot
-# process.
-#
-# Based on the udev init.d script
-#
-# Thanks go out to the Gentoo developers for proving
-# that this is possible to do.
-#
-# Yes, it's very verbose, feel free to turn off all of the echo calls,
-# they were there to make me feel better that everything was working
-# properly during development...
-#
-
-prog=udev
-sysfs_dir=/sys
-bin=/sbin/udev
-udevd=/sbin/udevd
-udev_root="/dev"
-
-starttime=$(date +%s)
-
-
-function trigger_builtin_events() {
- list="$(echo /sys/class/tty/ttyS*/uevent)"
- for i in $list; do
- case "$i" in
- */class/uevent|*\**)
- continue
- ;;
- */class/tty/ttyS*)
- echo "add" > "$i"
- ;;
- esac
- done
- }
-
-function trigger_device_events() {
- /sbin/udevtrigger
-}
-
-function wait_for_queue() {
-# loop=20
-# while ! [ "$loop" -gt 0 -a -d /dev/.udev/queue ]; do
-# sleep 0.1;
-# loop=$(($loop - 1))
-# done
- /sbin/udevsettle
-}
-
-make_extra_nodes () {
- # there are a few things that sysfs does not export for us.
- # these things go here (and remember to remove them in
- # remove_extra_nodes()
- #
- # Thanks to Gentoo for the initial list of these.
- ln -snf /proc/self/fd $udev_root/fd
- ln -snf /proc/self/fd/0 $udev_root/stdin
- ln -snf /proc/self/fd/1 $udev_root/stdout
- ln -snf /proc/self/fd/2 $udev_root/stderr
- ln -snf /proc/kcore $udev_root/core
-
- mkdir $udev_root/pts
- mkdir $udev_root/shm
-}
-
-udev_init () {
-# don't use udev if sysfs is not mounted.
-if [ ! -d $sysfs_dir/block ]; then
- exit 1
-fi
-
-echo "mounting... ramfs at $udev_root"
-mount -n -t ramfs none $udev_root
-
-# propogate /udev from /sys
-echo "Creating initial udev device nodes:"
-
-#echo "making extra nodes"
-make_extra_nodes
-
-# check if udevd is already running
-if [ `pidof -o %PPID /sbin/udevd` ]; then
- grep -v "/dev/shm" /etc/mtab | grep -v "/dev/pts" > /etc/mtab
- mount /dev/pts
- mount /dev/shm
-else
- echo "start udev daemon"
- /sbin/udevd --daemon
-fi
-case "$(uname -r)" in
- 2.6.[0-9]|2.6.[0-9][!0-9]*) ;;
- *) if [ -f "/sys/class/tty/console/uevent" ]; then
- echo "Kernel >= 2.6.15 and supports uevents"
- # trigger the sorted events
- echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
- # catch events that are real fast
- mkdir -p /dev/.udev/queue
- trigger_builtin_events
- else
- # for older kernels without uevents will be removed when udevstart dies in udev
- echo "Kernel does not support uevents, you need a kernel >= 2.6.15!"
- exit 1
- fi
- ;;
-esac
-}
-
-udev_uevents () {
-# configure all devices
-trigger_device_events
-# until we know how to do better, just wait for _all_ events to finish
-wait_for_queue
-}
-
-if [ $# -eq 0 ]; then
-udev_init
-udev_uevents
-fi
-
-[ "$1" = "init" ] && udev_init
-[ "$1" = "uevents" ] && udev_uevents
-
-echo "udev startup is finished! - time = $(( `date +%s` - $starttime ))"
-exit 0
Modified: udev.install
===================================================================
--- udev.install 2009-03-07 14:47:54 UTC (rev 29264)
+++ udev.install 2009-03-07 14:48:09 UTC (rev 29265)
@@ -1,15 +1,33 @@
# arg 1: the new package version
# arg 2: the old package version
+
+_make_udev_devices() {
+ [ -c /lib/udev/devices/console ] || mknod -m 0600 /lib/udev/devices/console c 5 1
+ [ -c /lib/udev/devices/null ] || mknod -m 0666 /lib/udev/devices/null c 1 3
+ [ -c /lib/udev/devices/zero ] || mknod -m 0666 /lib/udev/devices/zero c 1 5
+
+ [ -L /lib/udev/devices/fd ] || ln -snf /proc/self/fd /lib/udev/devices/fd
+
+ [ -L /lib/udev/devices/fd/stdin ] || ln -snf /proc/self/fd/0 /lib/udev/devices/stdin
+ [ -L /lib/udev/devices/fd/stdout ] || ln -snf /proc/self/fd/1 /lib/udev/devices/stdout
+ [ -L /lib/udev/devices/fd/stderr ] || ln -snf /proc/self/fd/2 /lib/udev/devices/stderr
+
+ [ -L /lib/udev/devices/core ] || ln -snf /proc/kcore /lib/udev/devices/core
+}
+
post_upgrade() {
-if [ "$(vercmp $2 100)" -lt 0 ]; then
- echo "ATTENTION UDEV:"
- echo "----------"
- echo "udev >=098 rules syntax has changed, please update your own rules."
- echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules."
- echo "Please read the instructions carefully before reboot."
- echo "They are located in /etc/udev/readme-udev-arch.txt"
- echo "----------"
-fi
+ if [ "$(vercmp $2 100)" -lt 0 ]; then
+ echo "ATTENTION UDEV:"
+ echo "----------"
+ echo "udev >=098 rules syntax has changed, please update your own rules."
+ echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules."
+ echo "Please read the instructions carefully before reboot."
+ echo "They are located in /etc/udev/readme-udev-arch.txt"
+ echo "----------"
+ fi
+ if [ "$(vercmp $2 135-2)" -lt 0 ]; then
+ _make_udev_devices
+ fi
}
post_install() {
@@ -25,8 +43,13 @@
umount ${ROOTDIR}
rmdir ${ROOTDIR}
fi
+ _make_udev_devices
}
+pre_remove() {
+ rm /lib/udev/devices/{console,null,zero,fd,stdin,stdout,stderr,core} &> /dev/null
+}
+
op=$1
shift
$op $*
More information about the arch-commits
mailing list