Ignore luks crypt devices while not fully up. Small rule cleanup.
authorMatthias Schwarzott <zzam@gentoo.org>
Wed, 28 Mar 2007 16:28:27 +0000 (16:28 +0000)
committerMatthias Schwarzott <zzam@gentoo.org>
Wed, 28 Mar 2007 16:28:27 +0000 (16:28 +0000)
Package-Manager: portage-2.1.2.2

sys-fs/udev/ChangeLog
sys-fs/udev/Manifest
sys-fs/udev/files/64-device-mapper.rules-107-r1 [new file with mode: 0644]
sys-fs/udev/files/digest-udev-107-r1 [new file with mode: 0644]
sys-fs/udev/files/udev.rules-107-r1 [new file with mode: 0644]
sys-fs/udev/udev-107-r1.ebuild [new file with mode: 0644]

index 23a43fadf644b65be19848bbd6cf395f8a55a8b6..612071c8c939517e10decc857e101e6fd0abd0a1 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.291 2007/03/27 20:44:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.292 2007/03/28 16:28:27 zzam Exp $
+
+*udev-107-r1 (28 Mar 2007)
+
+  28 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/64-device-mapper.rules-107-r1, +files/udev.rules-107-r1,
+  +udev-107-r1.ebuild:
+  Ignore luks crypt devices while not fully up. Small rule cleanup.
 
   27 Mar 2007; Matthias Schwarzott <zzam@gentoo.org> udev-079-r2.ebuild,
   udev-087.ebuild, udev-087-r1.ebuild, udev-090-r1.ebuild, udev-094.ebuild,
index 64c9a1e8acecb14db0fac9bfce40e02adf5e1abb..232d119ae7e779946012dba06379c06e6a7c089e 100644 (file)
@@ -25,6 +25,10 @@ AUX 64-device-mapper.rules-107 1140 RMD160 e4824e806636c7908782f188a636a6a47a66c
 MD5 f0a523438f544390d1bfc73acb225710 files/64-device-mapper.rules-107 1140
 RMD160 e4824e806636c7908782f188a636a6a47a66cc62 files/64-device-mapper.rules-107 1140
 SHA256 d96f0a1025bfb06dbf48b47ed02a34dd29a5e2cb335a758e0e87c4bcab872216 files/64-device-mapper.rules-107 1140
+AUX 64-device-mapper.rules-107-r1 1264 RMD160 f7d32fd6a668177de4b2b2dd9707e69ee16b8488 SHA1 11b8dafc8ce2654ebaf2e36adeb0745827647574 SHA256 8ead10d072e8b32f00de27270f81f238d1f549db4696aa098469ac572a2197a3
+MD5 d1034495c7562e9472e408f3bf6b5535 files/64-device-mapper.rules-107-r1 1264
+RMD160 f7d32fd6a668177de4b2b2dd9707e69ee16b8488 files/64-device-mapper.rules-107-r1 1264
+SHA256 8ead10d072e8b32f00de27270f81f238d1f549db4696aa098469ac572a2197a3 files/64-device-mapper.rules-107-r1 1264
 AUX 95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 SHA1 53cf6e38d817f1d885cd54f8c2d1674c83878609 SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574
 MD5 b9c490717a6a973b52edd7082a7b09f8 files/95-net.rules 550
 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 files/95-net.rules 550
@@ -281,6 +285,10 @@ AUX udev.rules-106-r5 11023 RMD160 e9e110196a1f59ab17da7947655f6e53434075c1 SHA1
 MD5 04bedd5114c8d056beced6ee14ee8545 files/udev.rules-106-r5 11023
 RMD160 e9e110196a1f59ab17da7947655f6e53434075c1 files/udev.rules-106-r5 11023
 SHA256 aab91cfcfb4456b8ba5f9375c0c989d3ba3a5de05ab7c294227536826d326491 files/udev.rules-106-r5 11023
+AUX udev.rules-107-r1 11024 RMD160 4a49fa4712f2c63b85d3abc3764d698790cceb5f SHA1 b54564ef0642beb309014667c6aee014ca9cbb72 SHA256 b694a6bc6cdc8bb2206e9a6412ec2da0a33f29cb5ac8c421ff1e19d6820232fc
+MD5 0fa6cdb951ab2ab6a737590d1f71e70f files/udev.rules-107-r1 11024
+RMD160 4a49fa4712f2c63b85d3abc3764d698790cceb5f files/udev.rules-107-r1 11024
+SHA256 b694a6bc6cdc8bb2206e9a6412ec2da0a33f29cb5ac8c421ff1e19d6820232fc files/udev.rules-107-r1 11024
 AUX udev.rules.post_012 4184 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a SHA1 12300249d33f01c4fd1a8708a4733dafddb90ffe SHA256 3fc8785c40acb43d92a2f7b3c4e21cfa7b947fb5d2e87d1c109297ff34994100
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
 RMD160 0fa81b4bafa732497b8e65cf658adf2cf32f3a0a files/udev.rules.post_012 4184
@@ -361,14 +369,18 @@ EBUILD udev-106-r5.ebuild 9853 RMD160 d939dfc1174d6514a1573f798b4dff5357c7d7e7 S
 MD5 373dcd1fb4198b63b378df65e45e5f5c udev-106-r5.ebuild 9853
 RMD160 d939dfc1174d6514a1573f798b4dff5357c7d7e7 udev-106-r5.ebuild 9853
 SHA256 c25f2a33ed4a70e0fdf24c74f7216a54bd06ea6e9a703960217e97b669b03830 udev-106-r5.ebuild 9853
+EBUILD udev-107-r1.ebuild 9612 RMD160 7eefe9e051427d977fb2c235a485f67c48ad413b SHA1 941fe71b88b04999cbeed1911ba0c212e46434c7 SHA256 ce3de2e8aa6b7cd61fc5e8c329a1250e9b227d91fc1d1f21681aa0180a0e6f05
+MD5 ab9f46c208d066118acc22aae2a44417 udev-107-r1.ebuild 9612
+RMD160 7eefe9e051427d977fb2c235a485f67c48ad413b udev-107-r1.ebuild 9612
+SHA256 ce3de2e8aa6b7cd61fc5e8c329a1250e9b227d91fc1d1f21681aa0180a0e6f05 udev-107-r1.ebuild 9612
 EBUILD udev-107.ebuild 9606 RMD160 7cb0a22df0c433bfd030cf89f5aec74f2f2318e0 SHA1 26d27124b7b39c2f28f7832531088faf9e9f34c2 SHA256 2a9b72f37b300c15400daa2ed7b22d2ce7066313530022b7195ba137deebcba7
 MD5 57b8db1e7dbbc9a09e575fae116c1599 udev-107.ebuild 9606
 RMD160 7cb0a22df0c433bfd030cf89f5aec74f2f2318e0 udev-107.ebuild 9606
 SHA256 2a9b72f37b300c15400daa2ed7b22d2ce7066313530022b7195ba137deebcba7 udev-107.ebuild 9606
-MISC ChangeLog 55622 RMD160 062a75659e3b608a000d931bc82b9d0a6ac5bebb SHA1 ce679523289e7886769ac403c47ed2488f84e40a SHA256 1017840b64884761235375de1cff4faa5ed14e3ced1f3e51ad9f14c60057ab9b
-MD5 fdadfdc795522072c35abc9fbea3aa42 ChangeLog 55622
-RMD160 062a75659e3b608a000d931bc82b9d0a6ac5bebb ChangeLog 55622
-SHA256 1017840b64884761235375de1cff4faa5ed14e3ced1f3e51ad9f14c60057ab9b ChangeLog 55622
+MISC ChangeLog 55861 RMD160 44428c334de5156b717aa7791fd9b3b3fcf6dd28 SHA1 95385ae5714bb0e9115df6795426d43ff1121d12 SHA256 c1d0f8e6b8613024e5eaac74a047fb415d5fbb2e12018f7c031c30ede26c2462
+MD5 640cefb121e27945b414846d1501d0f0 ChangeLog 55861
+RMD160 44428c334de5156b717aa7791fd9b3b3fcf6dd28 ChangeLog 55861
+SHA256 c1d0f8e6b8613024e5eaac74a047fb415d5fbb2e12018f7c031c30ede26c2462 ChangeLog 55861
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -424,10 +436,13 @@ SHA256 6d6620b896b3c0eee107f7a7bdee0a648b198ec04d17599162e78d3743f2dd63 files/di
 MD5 02958e61cd79b1f5d3b668dffbf13870 files/digest-udev-107 229
 RMD160 d1e532d066897e48d4f7968fada33b9657d35853 files/digest-udev-107 229
 SHA256 285db05bbcc252c4a94bf3e2040de2b66a7f0757c2b79cae350dc232d9a15976 files/digest-udev-107 229
+MD5 02958e61cd79b1f5d3b668dffbf13870 files/digest-udev-107-r1 229
+RMD160 d1e532d066897e48d4f7968fada33b9657d35853 files/digest-udev-107-r1 229
+SHA256 285db05bbcc252c4a94bf3e2040de2b66a7f0757c2b79cae350dc232d9a15976 files/digest-udev-107-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGCYJmt2vP6XvVdOcRAlmyAJ0We0gcQpPBuA3RtyHHTFeoyFNC3wCg4aNd
-paVXCUbMpQj767DDTewLR/0=
-=eBQG
+iD8DBQFGCpeyt2vP6XvVdOcRAg+8AKCxkzOBwJdLkYX9a2ub4nJQXIXmpwCgmK85
+fbCO9ZolHQDibBWEHmc2J2I=
+=Sq08
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/64-device-mapper.rules-107-r1 b/sys-fs/udev/files/64-device-mapper.rules-107-r1
new file mode 100644 (file)
index 0000000..1100c1b
--- /dev/null
@@ -0,0 +1,31 @@
+# device mapper links hook into "change" events, when the dm table
+# becomes available; some table-types must be ignored
+
+KERNEL=="device-mapper",       NAME="mapper/control"
+
+KERNEL=="dm-*", ACTION=="add|change", GOTO="device_mapper_do"
+GOTO="device_mapper_end"
+LABEL="device_mapper_do"
+
+# lookup device name
+# use dmsetup, until devmap_name is provided by sys-fs/device-mapper
+PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info",
+       ENV{ID_DM_NAME}="%c"
+
+# do not do anything if dmsetup does not provide a name
+ENV{ID_DM_NAME}=="", NAME="", OPTIONS="ignore_device"
+
+# ignore luks crypt devices while not fully up
+ENV{ID_DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device"
+
+# use queried name
+ENV{ID_DM_NAME}=="?*", NAME="mapper/$env{ID_DM_NAME}"
+
+PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end"
+RESULT=="|*snapshot*|*error*", GOTO="device_mapper_end"
+
+IMPORT{program}="vol_id --export $tempnode"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}", OPTIONS="link_priority=50"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}", OPTIONS="link_priority=50"
+
+LABEL="device_mapper_end"
diff --git a/sys-fs/udev/files/digest-udev-107-r1 b/sys-fs/udev/files/digest-udev-107-r1
new file mode 100644 (file)
index 0000000..991f2f0
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 b90dcb9d6d164fa34fe6632c506ce867 udev-107.tar.bz2 189101
+RMD160 ebc2722e0306aea3f3c0cd828861a61021609ac7 udev-107.tar.bz2 189101
+SHA256 49c45315ba640547939b2e2949f9478af2279a3296e97328ee8f6a4b08f2eae9 udev-107.tar.bz2 189101
diff --git a/sys-fs/udev/files/udev.rules-107-r1 b/sys-fs/udev/files/udev.rules-107-r1
new file mode 100644 (file)
index 0000000..4646958
--- /dev/null
@@ -0,0 +1,309 @@
+# /etc/udev/rules/50-udev.rules:  device naming rules for udev
+#
+# Gentoo specific rules
+#
+# 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.
+#
+# Try not to modify this file, if you wish to change things, create a new rule
+# file that can be run before this one.
+#
+
+# Net devices can have arbitrary names, even
+# ones set by the user. Not try to match normal
+# rules on net devices (Bug #166652)
+SUBSYSTEM=="net", GOTO="gentoo_device_rules_end"
+
+# console
+KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",    OPTIONS="last_rule"
+KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty",    OPTIONS="last_rule"
+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="%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="%k", SYMLINK="tts/%n", GROUP="uucp", MODE="0660"
+KERNEL=="ttyUSB[0-9]*",        NAME="%k", SYMLINK="tts/USB%n", GROUP="uucp", MODE="0660"
+KERNEL=="ippp0",       NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="isdn*"                NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="dcbri*",      NAME="%k", GROUP="uucp", MODE="0660"
+KERNEL=="ircomm*",     NAME="%k", GROUP="uucp", MODE="0660"
+
+# all block devices
+SUBSYSTEM=="block", GROUP="disk"
+
+# cdrom symlinks and other good cdrom naming
+KERNEL=="sr[0-9]*|hd[a-z]|pcd[0-9]*", ACTION=="add", IMPORT{program}="cdrom_id --export $tempnode"
+ENV{ID_CDROM}=="?*", GROUP="cdrom"
+
+# assign cdrom-permission also to associated generic device (for cd-burning ...)
+KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", GROUP="cdrom"
+
+# disk devices
+KERNEL=="sd*",         NAME="%k", GROUP="disk"
+KERNEL=="dasd*",       NAME="%k", GROUP="disk"
+KERNEL=="ataraid*",    NAME="%k", GROUP="disk"
+
+# compaq smart array
+KERNEL=="cciss*",      NAME="%k"
+KERNEL=="ida*",                NAME="%k"
+
+# mylex
+KERNEL=="rd*",         NAME="%k"
+
+# dri devices
+KERNEL=="card*",       NAME="dri/card%n", GROUP="video"
+KERNEL=="nvidia*",     NAME="%k", GROUP="video"
+KERNEL=="3dfx*",       NAME="%k", GROUP="video"
+
+# 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=="midiC[D0-9]*",                NAME="snd/%k"
+KERNEL=="timer",               NAME="snd/%k"
+KERNEL=="seq",                 NAME="snd/%k"
+
+# capi devices
+KERNEL=="capi",                NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp", MODE="0660"
+KERNEL=="capi*",       NAME="capi/%n", GROUP="uucp", MODE="0660"
+
+# cpu devices
+KERNEL=="cpu[0-9]*",   NAME="cpu/%n/cpuid"
+KERNEL=="msr[0-9]*",   NAME="cpu/%n/msr"
+KERNEL=="microcode",   NAME="cpu/microcode"
+
+# fb devices
+KERNEL=="fb[0-9]*",    NAME="fb/%n", SYMLINK+="%k", GROUP="video"
+
+# floppy devices
+KERNEL=="fd[0-9]*",    NAME="floppy/%k", SYMLINK+="%k", GROUP="floppy"
+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0660 -G floppy $root/floppy/%k"
+KERNEL=="fd[0-9]*", ACTION=="remove", RUN+="/bin/sh -c 'rm -f $root/floppy/%k?*'"
+
+# i2c devices
+KERNEL=="i2c-[0-9]*",  NAME="i2c/%n", SYMLINK+="%k"
+
+# input devices
+KERNEL=="mice",                NAME="input/%k", MODE="0644"
+KERNEL=="mouse*",      NAME="input/%k", MODE="0644"
+KERNEL=="event*",      NAME="input/%k", MODE="0600"
+KERNEL=="js*",         NAME="input/%k", MODE="0664"
+KERNEL=="ts*",         NAME="input/%k", MODE="0600"
+
+# loop devices
+KERNEL=="loop[0-9]*",  NAME="loop/%n", SYMLINK+="%k", GROUP="disk"
+
+# md block devices
+KERNEL=="md[0-9]*",    NAME="md/%n", SYMLINK+="%k", GROUP="disk"
+
+# aoe char devices,
+SUBSYSTEM=="aoe", KERNEL=="discover",  NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM=="aoe", KERNEL=="err",       NAME="etherd/%k", GROUP="disk", MODE="0440"
+SUBSYSTEM=="aoe", KERNEL=="interfaces",        NAME="etherd/%k", GROUP="disk", MODE="0220"
+
+# misc devices
+KERNEL=="agpgart",     NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="psaux",       NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="rtc",         NAME="misc/%k", SYMLINK+="%k", MODE="0664"
+KERNEL=="uinput",      NAME="misc/%k", SYMLINK+="%k"
+KERNEL=="inotify",     NAME="misc/%k", SYMLINK+="%k", MODE="0666"
+
+# 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"
+KERNEL=="tap*",                NAME="netlink/%k"
+
+# network devices
+KERNEL=="tun",         NAME="net/%k",  MODE="0600"
+
+# ramdisk devices
+KERNEL=="ram[0-9]*",   NAME="rd/%n", SYMLINK+="%k"
+
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394",     NAME="%k",              GROUP="video"
+KERNEL=="dv1394*",     NAME="dv1394/%n",       GROUP="video"
+KERNEL=="video1394*",  NAME="video1394/%n",    GROUP="video"
+
+# raw devices
+SUBSYSTEM=="raw",      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="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"
+KERNEL=="urandom",     NAME="%k", MODE="0444"
+KERNEL=="mem",         NAME="%k", MODE="0640"
+KERNEL=="kmem",                NAME="%k", MODE="0640"
+KERNEL=="port",                NAME="%k", MODE="0640"
+KERNEL=="full",                NAME="%k", MODE="0666"
+KERNEL=="null",                NAME="%k", MODE="0666"
+KERNEL=="zero",                NAME="%k", MODE="0666"
+
+# usb devices
+KERNEL=="hiddev*",             NAME="usb/%k"
+KERNEL=="auer*",               NAME="usb/%k"
+KERNEL=="legousbtower*",       NAME="usb/%k", GROUP="usb"
+KERNEL=="dabusb*",             NAME="usb/%k"
+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", 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
+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"
+KERNEL=="zaptimer",    NAME="zap/timer"
+KERNEL=="zapchannel",  NAME="zap/channel"
+KERNEL=="zappseudo",   NAME="zap/pseudo"
+KERNEL=="zap[0-9]*",   NAME="zap/%n"
+
+# pilot/palm devices
+KERNEL=="pilot",       NAME="%k", GROUP="uucp"
+
+# jaz devices
+KERNEL=="jaz*",                NAME="%k", GROUP="disk"
+
+# zip devices
+KERNEL=="pocketzip*",  NAME="%k", GROUP="disk"
+KERNEL=="zip*",                NAME="%k", GROUP="disk"
+
+# ls120 devices
+KERNEL=="ls120",       NAME="%k", GROUP="disk"
+
+# lp devices
+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"
+KERNEL=="nht*",                NAME="%k", GROUP="tape"
+KERNEL=="pt*",         NAME="%k", GROUP="tape"
+KERNEL=="npt*",                NAME="%k", GROUP="tape"
+KERNEL=="st*",         NAME="%k", GROUP="tape"
+KERNEL=="nst*",                NAME="%k", GROUP="tape"
+KERNEL=="osst*",       NAME="%k", GROUP="tape"
+KERNEL=="nosst*",      NAME="%k", GROUP="tape"
+
+# diskonkey devices
+KERNEL=="diskonkey*",  NAME="%k", GROUP="disk"
+
+# rem_ide devices
+KERNEL=="microdrive*", NAME="%k", GROUP="disk"
+
+# kbd devices
+KERNEL=="kbd",         NAME="%k", MODE="0664"
+
+# Sony Vaio Jogdial sonypi device
+KERNEL=="sonypi",      NAME="%k", MODE="0666"
+
+# packet devices
+KERNEL=="pktcdvd",             NAME="pktcdvd/control", GROUP="cdrw", MODE="0660"
+KERNEL=="pktcdvd[0-9]*",       NAME="pktcdvd/pktcdvd%n", GROUP="cdrw", MODE="0660"
+
+# infiniband devices
+KERNEL=="umad*",       NAME="infiniband/%k"
+KERNEL=="issm*",       NAME="infiniband/%k"
+
+
+# usbfs-like device nodes
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="usb", MODE="0664"
+
+
+# Setting timeout for tape-devices to 900 seconds
+# if you need timeouts for other devices add a similar rule
+# with correct type-value, or open a bug on bugs.gentoo.org.
+ACTION=="add", SUBSYSTEM=="scsi" , ATTRS{type}=="1", \
+       RUN+="/bin/sh -c 'echo 900 > /sys$$DEVPATH/timeout'"
+
+
+# Module autoloading
+ACTION!="add", GOTO="hotplug_no_add_event"
+
+# check if the device has already been claimed by a driver
+ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_load_end"
+
+# this driver is broken and should not be loaded automatically
+SUBSYSTEM=="platform", ENV{MODALIAS}=="i82365", GOTO="hotplug_load_end"
+
+# Autoload modules that lack aliases but have them defined inutoload modules
+ENV{MODALIAS}=="?*", RUN+="modprobe.sh $env{MODALIAS}"
+
+# /etc/modprobe.conf.
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/modprobe.sh pnp:d$$id; done < /sys$devpath/id'"
+# needed aliases are defined in /etc/modprobe.d/pnp-aliases
+
+
+SUBSYSTEM=="i2o", RUN+="modprobe.sh i2o_block"
+SUBSYSTEM=="mmc", RUN+="modprobe.sh mmc_block"
+
+# Parts taken from redhat-rules
+# sd:           0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+# sr:           4 TYPE_WORM, 5 TYPE_ROM
+# st/osst:      1 TYPE_TAPE
+
+# Load driver for scsi-device
+SUBSYSTEM!="scsi_device", GOTO="hotplug_scsi_end"
+ATTRS{type}=="?*",     RUN+="modprobe.sh sg"
+ATTRS{type}=="0|7|14", RUN+="modprobe.sh sd_mod"
+ATTRS{type}=="4|5",    RUN+="modprobe.sh sr_mod"
+ATTRS{type}=="8",      RUN+="modprobe.sh ch"
+
+ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st"
+ATTRS{type}=="1", ATTRS{vendor}=="On[sS]tream", \
+       ATTRS{model}!="ADR*", ENV{ID_SCSI_TAPE_DRIVER}="osst"
+ENV{ID_SCSI_TAPE_DRIVER}=="?*", RUN+="modprobe.sh $env{ID_SCSI_TAPE_DRIVER}"
+LABEL="hotplug_scsi_end"
+
+
+SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
+
+LABEL="hotplug_load_end"
+
+
+# Load firmware
+SUBSYSTEM=="firmware", RUN+="firmware.sh"
+
+LABEL="hotplug_no_add_event"
+
+LABEL="gentoo_device_rules_end"
+
+# 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+="udev_run_hotplugd $env{SUBSYSTEM}"
+
+# always run /etc/dev.d/ stuff for now.
+#RUN+="udev_run_devd $env{SUBSYSTEM}"
diff --git a/sys-fs/udev/udev-107-r1.ebuild b/sys-fs/udev/udev-107-r1.ebuild
new file mode 100644 (file)
index 0000000..d45bd6d
--- /dev/null
@@ -0,0 +1,292 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-107-r1.ebuild,v 1.1 2007/03/28 16:28:27 zzam Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
+SRC_URI="mirror://kernel/linux/utils/kernel/hotplug/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="selinux? ( sys-libs/libselinux )"
+RDEPEND="!sys-apps/coldplug"
+RDEPEND="${DEPEND} ${RDEPEND}
+       >=sys-apps/baselayout-1.12.5"
+# We need the lib/rcscripts/addon support
+PROVIDE="virtual/dev-manager"
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+
+       # patches go here...
+       #epatch ${FILESDIR}/${P}-udev_volume_id.patch
+       epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch
+       epatch ${FILESDIR}/udev-107-usbcd-by-id.patch
+
+       # No need to clutter the logs ...
+       sed -ie '/^DEBUG/ c\DEBUG = false' Makefile
+       # Do not use optimization flags from the package
+       sed -ie 's|$(OPTIMIZATION)||g' Makefile
+
+       # Make sure there is no sudden changes to udev.rules.gentoo
+       # (more for my own needs than anything else ...)
+       MD5=`md5sum < "${S}/etc/udev/gentoo/udev.rules"`
+       MD5=${MD5/  -/}
+       if [ "${MD5}" != "34b1f1695b339d0d9e7b9db27f87e938" ]
+       then
+               echo
+               eerror "gentoo/udev.rules has been updated, please validate!"
+               die "gentoo/udev.rules has been updated, please validate!"
+       fi
+}
+
+src_compile() {
+       filter-flags -fprefetch-loop-arrays
+       local myconf=
+       local extras="extras/ata_id \
+                                 extras/cdrom_id \
+                                 extras/edd_id \
+                                 extras/firmware \
+                                 extras/floppy \
+                                 extras/path_id \
+                                 extras/scsi_id \
+                                 extras/usb_id \
+                                 extras/volume_id \
+                                 extras/rule_generator"
+
+       use selinux && myconf="${myconf} USE_SELINUX=true"
+
+       # Not everyone has full $CHOST-{ld,ar,etc...} yet
+       local mycross=""
+       type -p ${CHOST}-ar && mycross=${CHOST}-
+
+       echo "get_libdir = $(get_libdir)"
+       # Do not work with emake
+       make \
+               EXTRAS="${extras}" \
+               udevdir="/dev/" \
+               CROSS_COMPILE=${mycross} \
+               ${myconf} || die
+}
+
+src_install() {
+       # we install everything by "hand" and don't rely on the udev Makefile to do
+       # it for us (why? it's easier that way...)
+       dobin udevinfo          || die "Required binary not installed properly"
+       dobin udevtest          || die "Required binary not installed properly"
+       dobin udevmonitor       || die "Required binary not installed properly"
+       into /
+       dosbin udevd            || die "Required binary not installed properly"
+       dosbin udevstart        || die "Required binary not installed properly"
+       dosbin udevtrigger      || die "Required binary not installed properly"
+       dosbin udevcontrol      || die "Required binary not installed properly"
+       dosbin udevsettle       || die "Required binary not installed properly"
+
+       # Helpers
+       exeinto /lib/udev
+       doexe extras/ata_id/ata_id              || die "Required helper not installed properly"
+       doexe extras/volume_id/vol_id   || die "Required helper not installed properly"
+       doexe extras/scsi_id/scsi_id    || die "Required helper not installed properly"
+       doexe extras/usb_id/usb_id              || die "Required helper not installed properly"
+       doexe extras/path_id/path_id    || die "Required helper not installed properly"
+       doexe extras/cdrom_id/cdrom_id  || die "Required helper not installed properly"
+       doexe extras/edd_id/edd_id              || die "Required helper not installed properly"
+       doexe extras/rule_generator/write_cd_rules      || die "Required helper not installed properly"
+       doexe extras/rule_generator/write_net_rules     || die "Required helper not installed properly"
+       doexe extras/rule_generator/rule_generator.functions    || die "Required helper not installed properly"
+       keepdir /lib/udev/state
+       keepdir /lib/udev/devices
+
+       # create symlinks for these utilities to /sbin
+       # where multipath-tools expect them to be (Bug #168588)
+       dosym ../lib/udev/vol_id /sbin/vol_id
+       dosym ../lib/udev/scsi_id /sbin/scsi_id
+
+       # vol_id library (needed by mount and HAL)
+       dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
+       # move the .a files to /usr/lib
+       dodir /usr/$(get_libdir)
+       mv -f "${D}"/$(get_libdir)/*.a  "${D}"/usr/$(get_libdir)/
+
+       # handle static linking bug #4411
+       gen_usr_ldscript libvolume_id.so
+
+       # save pkgconfig info
+       insinto /usr/$(get_libdir)/pkgconfig
+       doins extras/volume_id/lib/*.pc
+
+       #exeinto /etc/udev/scripts
+       exeinto /lib/udev
+       #doexe extras/ide-devfs.sh
+       #doexe extras/scsi-devfs.sh
+       #doexe extras/raid-devfs.sh
+       doexe extras/floppy/create_floppy_devices       || die "Required binary not installed properly"
+       doexe extras/firmware/firmware.sh                       || die "Required binary not installed properly"
+       newexe ${FILESDIR}/net-104-r10.sh net.sh        || die "Required binary not installed properly"
+       newexe ${FILESDIR}/modprobe-105.sh modprobe.sh  || die "Required binary not installed properly"
+       doexe extras/eventrecorder.sh                           || die "Required binary not installed properly"
+
+       # Our udev config file
+       insinto /etc/udev
+       newins ${FILESDIR}/udev.conf.post_081 udev.conf
+
+       # Our rules files
+       insinto /etc/udev/rules.d/
+       newins etc/udev/gentoo/udev.rules 50-udev.rules
+       newins ${FILESDIR}/udev.rules-107-r1 50-udev.rules
+       newins ${FILESDIR}/05-udev-early.rules-106-r5 05-udev-early.rules
+       doins ${FILESDIR}/95-udev-late.rules
+       # Use upstream's persistent rules for devices
+       doins etc/udev/rules.d/60-*.rules
+       doins extras/rule_generator/75-*.rules || die "rules not installed properly"
+       # Special rules for device-mapper
+       newins ${FILESDIR}/64-device-mapper.rules-107-r1 64-device-mapper.rules
+
+       # scsi_id configuration
+       insinto /etc
+       doins extras/scsi_id/scsi_id.config
+
+       # set up the /etc/dev.d directory tree
+       keepdir /etc/dev.d
+
+       # all of the man pages
+       doman *.7
+       doman *.8
+       doman extras/ata_id/ata_id.8
+       doman extras/edd_id/edd_id.8
+       doman extras/scsi_id/scsi_id.8
+       doman extras/volume_id/vol_id.8
+       doman extras/cdrom_id/cdrom_id.8
+       # create a extra symlink for udevcontrol
+       dosym udevd.8 /usr/share/man/man8/udevcontrol.8
+
+       # our udev hooks into the rc system
+       insinto /$(get_libdir)/rcscripts/addons
+       newins "${FILESDIR}"/udev-start-107.sh udev-start.sh
+       newins "${FILESDIR}"/udev-stop-105.sh udev-stop.sh
+
+       # needed to compile latest Hal
+       insinto /usr/include
+       doins extras/volume_id/lib/libvolume_id.h
+
+       dodoc ChangeLog FAQ README TODO RELEASE-NOTES
+       dodoc docs/{overview,udev_vs_devfs}
+       dodoc docs/writing_udev_rules/*
+
+       newdoc extras/volume_id/README README_volume_id
+
+       insinto /etc/modprobe.d
+       doins ${FILESDIR}/blacklist ${FILESDIR}/pnp-aliases
+
+       if use s390; then
+               # s390 does not has persistent mac addresses
+               # and we only have persistence rules for mac.
+               # For now just remove the rules file.
+               rm ${D}/etc/udev/rules.d/75-persistent-net-generator.rules
+       fi
+
+}
+
+pkg_preinst() {
+       if [[ -d ${ROOT}/lib/udev-state ]] ; then
+               mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+               rm -r "${ROOT}"/lib/udev-state
+       fi
+
+       if [ -f "${ROOT}/etc/udev/udev.config" -a \
+            ! -f "${ROOT}/etc/udev/udev.rules" ]
+       then
+               mv -f ${ROOT}/etc/udev/udev.config ${ROOT}/etc/udev/udev.rules
+       fi
+
+       # delete the old udev.hotplug symlink if it is present
+       if [ -h "${ROOT}/etc/hotplug.d/default/udev.hotplug" ]
+       then
+               rm -f ${ROOT}/etc/hotplug.d/default/udev.hotplug
+       fi
+
+       # delete the old wait_for_sysfs.hotplug symlink if it is present
+       if [ -h "${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug" ]
+       then
+               rm -f ${ROOT}/etc/hotplug.d/default/05-wait_for_sysfs.hotplug
+       fi
+
+       # delete the old wait_for_sysfs.hotplug symlink if it is present
+       if [ -h "${ROOT}/etc/hotplug.d/default/10-udev.hotplug" ]
+       then
+               rm -f ${ROOT}/etc/hotplug.d/default/10-udev.hotplug
+       fi
+
+       # is there a stale coldplug initscript? (CONFIG_PROTECT leaves it behind)
+       coldplug_stale=""
+       if [ -f "${ROOT}/etc/init.d/coldplug" ]
+       then
+               coldplug_stale="1"
+       fi
+}
+
+pkg_postinst() {
+       if [[ ${ROOT} == "/" ]] ; then
+               # check if root of init-process is identical to ours
+               if [ -r /proc/1/root -a /proc/1/root/ -ef /proc/self/root/ ]; then
+                       einfo "restarting udevd now."
+                       if [[ -n $(pidof udevd) ]] ; then
+                               killall -15 udevd &>/dev/null
+                               sleep 1
+                               killall -9 udevd &>/dev/null
+                       fi
+                       /sbin/udevd --daemon
+               fi
+       fi
+
+       # people want reminders, I'll give them reminders.  Odds are they will
+       # just ignore them anyway...
+
+       if [[ ${coldplug_stale} == "1" ]] ; then
+               ewarn "A stale coldplug init script found. You should run:"
+               ewarn
+               ewarn "      rc-update del coldplug"
+               ewarn "      rm -f /etc/init.d/coldplug"
+               ewarn
+               ewarn "udev now provides its own coldplug functionality."
+       fi
+
+       # delete 40-scsi-hotplug.rules - all integrated in 50-udev.rules
+       if has_version "=sys-fs/udev-103-r3"; then
+               if [[ -e "${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules" ]]
+               then
+                       ewarn "Deleting stray 40-scsi-hotplug.rules"
+                       ewarn "installed by sys-fs/udev-103-r3"
+                       rm -f ${ROOT}/etc/udev/rules.d/40-scsi-hotplug.rules
+               fi
+       fi
+
+       # Removing some device-nodes we thought we need some time ago
+       if [[ -d "${ROOT}"/lib/udev/devices ]]; then
+               rm -f "${ROOT}"/lib/udev/devices/{null,zero,console,urandom}
+       fi
+
+       # Removing some old file
+       if has_version "<sys-fs/udev-104-r5"; then
+               rm -f "${ROOT}"/etc/dev.d/net/hotplug.dev
+               rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/net
+       fi
+
+       if has_version "<sys-fs/udev-106-r5"; then
+               if [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]]; then
+                       rm -f ${ROOT}/etc/udev/rules.d/95-net.rules
+               fi
+       fi
+
+       einfo
+       einfo "For more information on udev on Gentoo, writing udev rules, and"
+       einfo "         fixing known issues visit:"
+       einfo "         http://www.gentoo.org/doc/en/udev-guide.xml"
+}