[arch-commits] CVS update of core/base/udev (40-arch.rules 51-arch.rules PKGBUILD)

Tobias Powalowski tpowa at archlinux.org
Mon Mar 10 20:45:34 UTC 2008


    Date: Monday, March 10, 2008 @ 16:45:34
  Author: tpowa
    Path: /home/cvs-core/core/base/udev

   Added: 51-arch.rules (1.1)
Modified: PKGBUILD (1.157 -> 1.158)
 Removed: 40-arch.rules (1.1)

'upgpkg: splitted udev rules'


---------------+
 40-arch.rules |  191 --------------------------------------------------------
 51-arch.rules |  191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD      |   18 +++--
 3 files changed, 202 insertions(+), 198 deletions(-)


Index: core/base/udev/40-arch.rules
diff -u core/base/udev/40-arch.rules:1.1 core/base/udev/40-arch.rules:removed
--- core/base/udev/40-arch.rules:1.1	Sun Mar  9 18:17:46 2008
+++ core/base/udev/40-arch.rules	Mon Mar 10 16:45:34 2008
@@ -1,191 +0,0 @@
-# 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/51-arch.rules
diff -u /dev/null core/base/udev/51-arch.rules:1.1
--- /dev/null	Mon Mar 10 16:45:34 2008
+++ core/base/udev/51-arch.rules	Mon Mar 10 16:45:33 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.157 core/base/udev/PKGBUILD:1.158
--- core/base/udev/PKGBUILD:1.157	Sun Mar  9 18:17:46 2008
+++ core/base/udev/PKGBUILD	Mon Mar 10 16:45:33 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.157 2008/03/09 22:17:46 tpowa Exp $
+# $Id: PKGBUILD,v 1.158 2008/03/10 20:45:33 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
@@ -13,13 +13,14 @@
 install=udev.install
 backup=(etc/udev/udev.conf
         etc/scsi_id.config
-        etc/udev/cdsymlinks.conf)
+        etc/udev/cdsymlinks.conf
+        etc/modprobe.d/framebuffer_blacklist)
 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 40-arch.rules load-modules.sh 
-        cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch framebuffer)
+        migrate-udev start_udev 51-arch.rules load-modules.sh 
+        cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -30,7 +31,7 @@
   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/40-arch.rules $startdir/pkg/etc/udev/rules.d/40-arch.rules
+  install -D -m644 $startdir/src/51-arch.rules $startdir/pkg/etc/udev/rules.d/51-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
@@ -63,6 +64,9 @@
      $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
+  # create framebuffer blacklist
+  mkdir -p $startdir/pkg/etc/modprobe.d/
+  for mod in $(find /lib/modules/ -name '*fb*.ko' -exec basename {} .ko \;); do 
+	echo "blacklist $mod" >> $startdir/pkg/etc/modprobe.d/framebuffer_blacklist
+  done
 }




More information about the arch-commits mailing list