From: Matthias Schwarzott Date: Tue, 16 Jan 2007 16:49:32 +0000 (+0000) Subject: Restrict cdrom_id rule to ACTION==add. Move network-init-script rules to a place... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5f73e498a2f0d050c965fa22904089e36f12467;p=gentoo.git Restrict cdrom_id rule to ACTION==add. Move network-init-script rules to a place after network-device persistance rules. Add rules to autoload scsi-device-class drivers (sr_mod, sd_mod). Package-Manager: portage-2.1.2 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 65f32ae270ae..56fef5bc8d9c 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,15 @@ # 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.224 2007/01/16 13:08:19 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.225 2007/01/16 16:49:32 zzam Exp $ + +*udev-103-r3 (16 Jan 2007) + + 16 Jan 2007; Matthias Schwarzott + +files/udev.rules-103-r3, +files/40-scsi-hotplug.rules, + +files/95-net.rules, +udev-103-r3.ebuild: + Restrict cdrom_id rule to ACTION==add. Move network-init-script rules to a + place after network-device persistance rules. Add rules to autoload + scsi-device-class drivers (sr_mod, sd_mod). *udev-103-r2 (16 Jan 2007) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 2d7f75e78629..36c2b6519efa 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288 @@ -6,6 +9,14 @@ AUX 05-udev-early.rules-079 385 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc MD5 c5e955ffa18f2f4526a67c00dbe8b870 files/05-udev-early.rules-079 385 RMD160 04de1f937d47a2d42eeec879851a1a00d847cecc files/05-udev-early.rules-079 385 SHA256 c50db994a4a40d6b7aa466944c2ab14a00a6269a2b9f0ae26b1049cf6881b682 files/05-udev-early.rules-079 385 +AUX 40-scsi-hotplug.rules 338 RMD160 43039de65d94b23ea2e3842d48987c74c5788f20 SHA1 588916e77490f6d8915dc23d265afd3f9096d3e2 SHA256 7e7867e1dbc889846e26f20870e2c9a685872f3dabdf6c8ac0911837857eac86 +MD5 ba9e173c0295e66741c7baec47fe2ae8 files/40-scsi-hotplug.rules 338 +RMD160 43039de65d94b23ea2e3842d48987c74c5788f20 files/40-scsi-hotplug.rules 338 +SHA256 7e7867e1dbc889846e26f20870e2c9a685872f3dabdf6c8ac0911837857eac86 files/40-scsi-hotplug.rules 338 +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 +SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574 files/95-net.rules 550 AUX net.sh 558 RMD160 3f846c5228d95cc0eaa36a075a3a8e2b90b24581 SHA1 6935e04a5472b4e024d85e4508ae9fe8365f3dde SHA256 4972e449b2958789c3dd87ae5975c340cfafb1bc216a42989a127401881d5eba MD5 84525266497f8100474ccffc8722cc99 files/net.sh 558 RMD160 3f846c5228d95cc0eaa36a075a3a8e2b90b24581 files/net.sh 558 @@ -174,6 +185,10 @@ AUX udev.rules-103-r2 9845 RMD160 a2247a7e55da61319d464f3b069658b82198adea SHA1 MD5 647b8eeaf08f7df0711a2b3e0114cdc4 files/udev.rules-103-r2 9845 RMD160 a2247a7e55da61319d464f3b069658b82198adea files/udev.rules-103-r2 9845 SHA256 489567f1c663143ba728c4861562d0d1e8f99adb11c849de3c871869eaceb4b4 files/udev.rules-103-r2 9845 +AUX udev.rules-103-r3 9666 RMD160 1435925f11e525aa2085679ba8e39ca637069fb5 SHA1 ce23881dda85fbf9b35b94b15393ad7ec9001518 SHA256 4de595e2bc92e874ad18de3bc30157cca3f7d5b93155a5c99d9c8b5e57613bc1 +MD5 a631d9d668f8143b10e5c71f8b5d57d3 files/udev.rules-103-r3 9666 +RMD160 1435925f11e525aa2085679ba8e39ca637069fb5 files/udev.rules-103-r3 9666 +SHA256 4de595e2bc92e874ad18de3bc30157cca3f7d5b93155a5c99d9c8b5e57613bc1 files/udev.rules-103-r3 9666 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 @@ -239,14 +254,18 @@ EBUILD udev-103-r2.ebuild 11384 RMD160 2f14be8c39e7c9e0eacdc338f8ba84bbc938bead MD5 faa012ba3bdb82ccc43499b0538a246c udev-103-r2.ebuild 11384 RMD160 2f14be8c39e7c9e0eacdc338f8ba84bbc938bead udev-103-r2.ebuild 11384 SHA256 27745555cf9967fb80403c377b66745cbc71efd2507a3070065d56179347cf8f udev-103-r2.ebuild 11384 -EBUILD udev-103.ebuild 11291 RMD160 f8e2e2bd08027bc6309c78b881374a8830aff0cf SHA1 df742c23113cdd25eb328bdad303b41cd8efb8e3 SHA256 625f7999f38f2d3be789d8b60554230329cd8e220a03bb74f103eef70672755c -MD5 8bf170e2466c9f7a171bb54a900763ab udev-103.ebuild 11291 -RMD160 f8e2e2bd08027bc6309c78b881374a8830aff0cf udev-103.ebuild 11291 -SHA256 625f7999f38f2d3be789d8b60554230329cd8e220a03bb74f103eef70672755c udev-103.ebuild 11291 -MISC ChangeLog 40043 RMD160 954a9a4e59e049b8488ab1308fc3e80c3c3dd125 SHA1 6b1fedcf991bf91ca6434a928b36ae2b2b0ecb7f SHA256 015aa290717d8585598290ae26a88d3bec87261a1f38e524cfdcc506c569c8f1 -MD5 cafae8e86d5ed8e6751e2563e619bf70 ChangeLog 40043 -RMD160 954a9a4e59e049b8488ab1308fc3e80c3c3dd125 ChangeLog 40043 -SHA256 015aa290717d8585598290ae26a88d3bec87261a1f38e524cfdcc506c569c8f1 ChangeLog 40043 +EBUILD udev-103-r3.ebuild 11453 RMD160 156993ab918d952969d8b9ef1e72bfc9b71395bb SHA1 3000b22a148bf13a5af37f635dd391dcf5dd00f1 SHA256 72e115614f35e51f0d8ba732dd7a263972a52bb21aa66b118b0b32971ba67347 +MD5 f43aee354543d865ada0ad74d276ef1d udev-103-r3.ebuild 11453 +RMD160 156993ab918d952969d8b9ef1e72bfc9b71395bb udev-103-r3.ebuild 11453 +SHA256 72e115614f35e51f0d8ba732dd7a263972a52bb21aa66b118b0b32971ba67347 udev-103-r3.ebuild 11453 +EBUILD udev-103.ebuild 11287 RMD160 bff5f34ad8de812ef7a13612b059ecb14da37421 SHA1 8cba27a49c381f45f5039d71b3930c445716c786 SHA256 f650d8df92004190e77a7d96ed437cbaee53fc2504858e63491d417854444c9b +MD5 740ea843e67f766c34a4b13feb82d9de udev-103.ebuild 11287 +RMD160 bff5f34ad8de812ef7a13612b059ecb14da37421 udev-103.ebuild 11287 +SHA256 f650d8df92004190e77a7d96ed437cbaee53fc2504858e63491d417854444c9b udev-103.ebuild 11287 +MISC ChangeLog 40416 RMD160 2c26b802cbe00564d6021eabb7d58aaf0ef69f5a SHA1 945bc3beb461a192899a3a9172b0e76767d4f214 SHA256 f23315f98eff52faf54accb4eee341c2888ecd8bd9b202a0f62c5fc910bfc360 +MD5 c89a91cfc5fdae4d8e2f9dae7a33a9bb ChangeLog 40416 +RMD160 2c26b802cbe00564d6021eabb7d58aaf0ef69f5a ChangeLog 40416 +SHA256 f23315f98eff52faf54accb4eee341c2888ecd8bd9b202a0f62c5fc910bfc360 ChangeLog 40416 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -293,3 +312,13 @@ SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/di MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103-r2 229 RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103-r2 229 SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103-r2 229 +MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103-r3 229 +RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103-r3 229 +SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103-r3 229 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFrQIst2vP6XvVdOcRArF1AJ9F/mOV1fWU2Jirp8n3LS17Y+YZRgCfXBw5 +EBSf1cSzLeEDfqI1Gp2Jueg= +=eHaQ +-----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/40-scsi-hotplug.rules b/sys-fs/udev/files/40-scsi-hotplug.rules new file mode 100644 index 000000000000..bd4d3eda99ab --- /dev/null +++ b/sys-fs/udev/files/40-scsi-hotplug.rules @@ -0,0 +1,10 @@ +SUBSYSTEM!="scsi_device", GOTO="scsi_hotplug_end" +ACTION!="add", GOTO="scsi_hotplug_end" + +ATTRS{type}=="0|7", DRIVERS!="*sd*", RUN+="/sbin/modprobe sd_mod" +ATTRS{type}=="4|5", DRIVERS!="*sr*", RUN+="/sbin/modprobe sr_mod" +ATTRS{type}=="1", RUN+="/sbin/modprobe st" + +ATTRS{type}!="", RUN+="/sbin/modprobe sg" + +LABEL="scsi_hotplug_end" diff --git a/sys-fs/udev/files/95-net.rules b/sys-fs/udev/files/95-net.rules new file mode 100644 index 000000000000..182e8738f6a8 --- /dev/null +++ b/sys-fs/udev/files/95-net.rules @@ -0,0 +1,15 @@ +# /etc/udev/rules/95-net.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. +# + +# Activate our network if we can +SUBSYSTEM=="net", ACTION=="add", RUN+="net.sh %k start", OPTIONS="last_rule" +SUBSYSTEM=="net", ACTION=="remove", RUN+="net.sh %k stop", OPTIONS="last_rule" + diff --git a/sys-fs/udev/files/digest-udev-103-r3 b/sys-fs/udev/files/digest-udev-103-r3 new file mode 100644 index 000000000000..1cb26bcabc2d --- /dev/null +++ b/sys-fs/udev/files/digest-udev-103-r3 @@ -0,0 +1,3 @@ +MD5 7360ce47b5ec3f9fa71f18071ecb8b97 udev-103.tar.bz2 200027 +RMD160 3b00a83ad8c538109ee030e2e471422272c7d071 udev-103.tar.bz2 200027 +SHA256 047f5e2895f707117ab726cedd89fd35e8c9105530af54a8038fe81cf61c4e3f udev-103.tar.bz2 200027 diff --git a/sys-fs/udev/files/udev.rules-103-r3 b/sys-fs/udev/files/udev.rules-103-r3 new file mode 100644 index 000000000000..3a5164913ac0 --- /dev/null +++ b/sys-fs/udev/files/udev.rules-103-r3 @@ -0,0 +1,279 @@ +# /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. +# + + +# 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="tty" +KERNEL=="ttyUSB[0-9]*", NAME="%k", SYMLINK="tts/USB%n", GROUP="tty", MODE="0660" +KERNEL=="ippp0", NAME="%k", GROUP="tty" +KERNEL=="isdn*" NAME="%k", GROUP="tty" +KERNEL=="dcbri*", NAME="%k", GROUP="tty" +KERNEL=="ircomm*", NAME="%k", GROUP="tty" + +# 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" +BUS=="scsi", KERNEL=="sg[0-9]*", ACTION=="add", DRIVERS=="sr", 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="dialout" +KERNEL=="capi*", NAME="capi/%n", GROUP="dialout" + +# cpu devices +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +# dm devices (ignore them) +KERNEL=="dm-[0-9]*", OPTIONS="ignore_device" +# create a symlink named after the device map name +# note devmap_name comes with extras/multipath +#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c" +KERNEL=="device-mapper", NAME="mapper/control" + +# fb devices +KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video" + +# floppy devices +KERNEL=="fd[0-9]*", NAME="floppy/%n", SYMLINK+="%k", GROUP="floppy" + +# 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="664" +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 +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", MODE="0644" + + +# Module autoloading + +# Autoload modules that lack aliases but have them defined inutoload modules +SYSFS{modalias}=="?*", ACTION=="add", RUN+="/sbin/modprobe $env{MODALIAS}" + +# /etc/modprobe.conf. +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe pnp:d$$id; done < /sys$devpath/id'" +# If you have problems with some pnp modules being loaded, please enter the +# following aliases into the modprobe configuration files. These are needed by +# udev to autoload some modules +# alias pnp:dPNP0510 irtty-sir +# alias pnp:dPNP0511 irtty-sir +# alias pnp:dPNP0700 floppy +# alias pnp:dPNP0800 pcspkr +# alias pnp:dPNP0b00 rtc +# alias pnp:dPNP0303 atkbd +# alias pnp:dPNP0f13 psmouse +# alias pnp:dPNPb02f analog + + + +# Load firmware +SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh" + + +# be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems +# run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart +#ENV{UDEVD_EVENT}=="1", RUN+="udev_run_hotplugd $env{SUBSYSTEM}" + +# always run /etc/dev.d/ stuff for now. +RUN+="udev_run_devd $env{SUBSYSTEM}" + +# debugging monitor +RUN+="socket:/org/kernel/udev/monitor" diff --git a/sys-fs/udev/udev-103-r3.ebuild b/sys-fs/udev/udev-103-r3.ebuild new file mode 100644 index 000000000000..a672d408dc0e --- /dev/null +++ b/sys-fs/udev/udev-103-r3.ebuild @@ -0,0 +1,324 @@ +# 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-103-r3.ebuild,v 1.1 2007/01/16 16:49:32 zzam Exp $ + +inherit eutils flag-o-matic multilib + +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 ~s390 ~sh ~sparc ~x86" +IUSE="selinux" + +# still rely on hotplug (need to fix that), but now we implement coldplug + +DEPEND="sys-apps/hotplug-base" +RDEPEND="!sys-apps/coldplug" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.11.14" +# 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 + + # 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}" != "295a9b7bdc8bdb239f8860d14af761b0" ] + 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/dasd_id \ + extras/edd_id \ + extras/firmware \ + extras/floppy \ + extras/path_id \ + extras/run_directory \ + 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" + + # need to keep this until /sbin/rc stops checking for its presence, it's + # really not needed for us to work properly at all. + dosbin udev || die "Required binary not installed properly" + + # Helpers + exeinto /lib/udev + doexe extras/run_directory/udev_run_devd || die "Required helper not installed properly" + doexe extras/run_directory/udev_run_hotplugd || die "Required helper not installed properly" + 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/dasd_id/dasd_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 + + # 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" + doexe ${FILESDIR}/net.sh || die "Required binary not installed properly" + doexe ${FILESDIR}/seq_node.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-103-r3 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-079 05-udev-early.rules + doins ${FILESDIR}/95-net.rules + doins ${FILESDIR}/40-scsi-hotplug.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" + + # scsi_id configuration + insinto /etc + doins extras/scsi_id/scsi_id.config + + # set up the /etc/dev.d directory tree + dodir /etc/dev.d/default + dodir /etc/dev.d/net + exeinto /etc/dev.d/net + doexe extras/run_directory/dev.d/net/hotplug.dev + + # 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/dasd_id/dasd_id.8 + doman extras/cdrom_id/cdrom_id.8 + # create a extra symlink for udevcontrol + ln -s "${D}"/usr/share/man/man8/udevd.8.gz \ + "${D}"/usr/share/man/man8/udevcontrol.8.gz + + # our udev hooks into the rc system + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-099.sh udev-start.sh + doins "${FILESDIR}"/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 + +} + +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 + + # Create some nodes that we know we need. + # set the time/date so we can see in /dev which ones we copied over + # in the udev-start.sh script + mkdir -p ${ROOT}/lib/udev/devices + + if [ ! -e ${ROOT}/lib/udev/devices/null ] ; then + mknod ${ROOT}/lib/udev/devices/null c 1 3 + fi + chmod 666 ${ROOT}/lib/udev/devices/null + touch -t 200010220101 ${ROOT}/lib/udev/devices/null + + if [ ! -e ${ROOT}/lib/udev/devices/zero ] ; then + mknod ${ROOT}/lib/udev/devices/zero c 1 5 + fi + chmod 666 ${ROOT}/lib/udev/devices/zero + touch -t 200010220101 ${ROOT}/lib/udev/devices/zero + + if [ ! -e ${ROOT}/lib/udev/devices/console ] ; then + mknod ${ROOT}/lib/udev/devices/console c 5 1 + fi + chmod 600 ${ROOT}/lib/udev/devices/console + chown root:tty ${ROOT}/lib/udev/devices/console + touch -t 200010220101 ${ROOT}/lib/udev/devices/console + + if [ ! -e ${ROOT}/lib/udev/devices/urandom ] ; then + mknod ${ROOT}/lib/udev/devices/urandom c 1 9 + fi + chmod 666 ${ROOT}/lib/udev/devices/urandom + touch -t 200010220101 ${ROOT}/lib/udev/devices/urandom +} + +pkg_postinst() { + if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ] + then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + + # people want reminders, I'll give them reminders. Odds are they will + # just ignore them anyway... + if has_version '