From: Matthias Schwarzott Date: Sat, 10 Feb 2007 22:28:14 +0000 (+0000) Subject: Does not call /etc/init.d/net.IFACE for network devices which are registed after... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=645c11a476656846ab2f48a3cbf55721b57aadab;p=gentoo.git Does not call /etc/init.d/net.IFACE for network devices which are registed after being up (like ppp, isdn), solving bug #165936. Added modprobe wrapper to make all modules blacklistable, Bug #130766, and to give console-output about loading modules. Package-Manager: portage-2.1.2-r9 --- diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index 54afcd443bfb..e579da696072 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,16 @@ # 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.249 2007/02/08 15:49:21 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.250 2007/02/10 22:28:14 zzam Exp $ + +*udev-104-r10 (10 Feb 2007) + + 10 Feb 2007; Matthias Schwarzott + +files/udev.rules-104-r10, +files/net-104-r10.sh, + +files/udev-start-104-r10.sh, +files/modprobe.sh, +udev-104-r10.ebuild: + Does not call /etc/init.d/net.IFACE for network devices which are registed + after being up (like ppp, isdn), solving bug #165936. Added modprobe wrapper + to make all modules blacklistable, Bug #130766, and to give console-output + about loading modules. 08 Feb 2007; Chris Gianelloni udev-104-r9.ebuild: Stable on alpha wrt bug #159871. diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index c7ce178c8d63..7dab00626648 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -17,6 +17,14 @@ AUX 95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 SHA1 53cf6e MD5 b9c490717a6a973b52edd7082a7b09f8 files/95-net.rules 550 RMD160 8e10d27a37f15bbcd8367266693b58d7a9101370 files/95-net.rules 550 SHA256 19c6783fdd8bfb4f66376fb4929cd9a1a554c8949a40364e2a5b36b2e31f7574 files/95-net.rules 550 +AUX modprobe.sh 731 RMD160 99d1cdbed347437bc2524350c07818677afe0d6d SHA1 dbc21b0b556496454bf9beab2321e314790cb483 SHA256 fa1037694aba05a7d40a44bf83d6a00839545a3d3730c8033cc8a215be62fcb9 +MD5 cf65ebd7bb614b6fcfc082bdd0f221f1 files/modprobe.sh 731 +RMD160 99d1cdbed347437bc2524350c07818677afe0d6d files/modprobe.sh 731 +SHA256 fa1037694aba05a7d40a44bf83d6a00839545a3d3730c8033cc8a215be62fcb9 files/modprobe.sh 731 +AUX net-104-r10.sh 719 RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d SHA1 baa060c99d7c38c26bcc629ee9844319bd886647 SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee +MD5 6e80c0636d03874473a1f17a4af2b6e7 files/net-104-r10.sh 719 +RMD160 e0c3a76c24108d43518f301ebe5cff7f3e06081d files/net-104-r10.sh 719 +SHA256 e3d7b8a447087b7357b6b7713089bf84aecf598714a569be75c45d7c3a7581ee files/net-104-r10.sh 719 AUX net.sh 558 RMD160 3f846c5228d95cc0eaa36a075a3a8e2b90b24581 SHA1 6935e04a5472b4e024d85e4508ae9fe8365f3dde SHA256 4972e449b2958789c3dd87ae5975c340cfafb1bc216a42989a127401881d5eba MD5 84525266497f8100474ccffc8722cc99 files/net.sh 558 RMD160 3f846c5228d95cc0eaa36a075a3a8e2b90b24581 files/net.sh 558 @@ -101,6 +109,10 @@ AUX udev-start-099.sh 3574 RMD160 306aa783d9915a24017730e7f5871350f096d818 SHA1 MD5 de8c4747585960be3a56c6d527feb550 files/udev-start-099.sh 3574 RMD160 306aa783d9915a24017730e7f5871350f096d818 files/udev-start-099.sh 3574 SHA256 e76e214ac122ea6e9dd3468f1d33a8376111a5299c9fef697f883d37f02ebd50 files/udev-start-099.sh 3574 +AUX udev-start-104-r10.sh 4038 RMD160 4c7c5c1b10cd12cf2f200a4e73b4a98526bfd895 SHA1 9ba66e17776ce154a317847fc609b0a108c5b6df SHA256 a939dfeaf281119423230d640df21fc9821eb3a762a2069c55d430a3d4f717bc +MD5 76bf49a5afa3324d6ae49eba6e7229b2 files/udev-start-104-r10.sh 4038 +RMD160 4c7c5c1b10cd12cf2f200a4e73b4a98526bfd895 files/udev-start-104-r10.sh 4038 +SHA256 a939dfeaf281119423230d640df21fc9821eb3a762a2069c55d430a3d4f717bc files/udev-start-104-r10.sh 4038 AUX udev-start-104-r5.sh 3987 RMD160 026f1df381f26e84bab116b84bc86728e96901d4 SHA1 9aba68a0bc3cec3ba19c5193c23fee9c3286d60d SHA256 0dc871d20caa16622b61fb988a0e65064efa96192f7fa078d585d1361b222823 MD5 7078fc6867da38a73c6fecc643fc85c2 files/udev-start-104-r5.sh 3987 RMD160 026f1df381f26e84bab116b84bc86728e96901d4 files/udev-start-104-r5.sh 3987 @@ -201,6 +213,10 @@ AUX udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae SHA1 52 MD5 295a9b7bdc8bdb239f8860d14af761b0 files/udev.rules-098 10095 RMD160 9bac5d74ee0fc2f62da56854121f9adef9501eae files/udev.rules-098 10095 SHA256 211d8d7820f0bb474f0ffad172359fc3b9f5064422ee68af5961558df0e1dcac files/udev.rules-098 10095 +AUX udev.rules-104-r10 10839 RMD160 ede925bc713fb54354283833df524adfdbbb480b SHA1 d39e2078f0eb74752814ac8f30676865304041fd SHA256 731a661ca842bba9a489822408cedf998b26bae49aed1e30e1de5b451de7e653 +MD5 60e897d6f9fed15af1b428b96035f087 files/udev.rules-104-r10 10839 +RMD160 ede925bc713fb54354283833df524adfdbbb480b files/udev.rules-104-r10 10839 +SHA256 731a661ca842bba9a489822408cedf998b26bae49aed1e30e1de5b451de7e653 files/udev.rules-104-r10 10839 AUX udev.rules-104-r7 10857 RMD160 35a7bc2812490e058ebd4c4bb4cd6a5560ad8796 SHA1 4fdc4493a7265aad3550fad7bf8e0dc62fe05148 SHA256 e37d18d83fc1d4625d03adda955b4c68927b793119b997806b6805562f0534a2 MD5 46b855d3f7b1fda2b32a548583cbb1fb files/udev.rules-104-r7 10857 RMD160 35a7bc2812490e058ebd4c4bb4cd6a5560ad8796 files/udev.rules-104-r7 10857 @@ -267,14 +283,18 @@ EBUILD udev-103.ebuild 11330 RMD160 2cd175754a4ca6f5e9f585d1558337f801838f6e SHA MD5 1d8eb946427b3797d10ade1e1a6a0324 udev-103.ebuild 11330 RMD160 2cd175754a4ca6f5e9f585d1558337f801838f6e udev-103.ebuild 11330 SHA256 791e5c5ef52eacb0c2b85b67221ced66f1b9fafcf1758c46ab92ee73ca86d529 udev-103.ebuild 11330 +EBUILD udev-104-r10.ebuild 9312 RMD160 29f6b8c8668314a69e100bed96da7b5a3046df73 SHA1 04de48ffeaf1aa86a51d8490fa42312cd6e497d1 SHA256 76e1adc9cf9ecaf66ebf4010333b5272f82d9c0e1b1b8dd29fd5925c69f1188d +MD5 2761b79b49c7d64a8a25078d8a60a86f udev-104-r10.ebuild 9312 +RMD160 29f6b8c8668314a69e100bed96da7b5a3046df73 udev-104-r10.ebuild 9312 +SHA256 76e1adc9cf9ecaf66ebf4010333b5272f82d9c0e1b1b8dd29fd5925c69f1188d udev-104-r10.ebuild 9312 EBUILD udev-104-r9.ebuild 9219 RMD160 ff22702a590bc9a296a9d7d6da877d8086636ece SHA1 4dbe1b8489a5cbdf97234ee50018028db45e8c56 SHA256 3eb16d236354c78ccac5efb590eb9448f86a76709cc11a5763dde6a7b7512825 MD5 b13be0a9f9ce370c1f349e6814deaa24 udev-104-r9.ebuild 9219 RMD160 ff22702a590bc9a296a9d7d6da877d8086636ece udev-104-r9.ebuild 9219 SHA256 3eb16d236354c78ccac5efb590eb9448f86a76709cc11a5763dde6a7b7512825 udev-104-r9.ebuild 9219 -MISC ChangeLog 46467 RMD160 5745313783e2f1532884d890077a752f0d48a5af SHA1 dce43cf628586b7cbda61e7d05996af86a70b9dc SHA256 bf9d1efa843fc9fdee5744036b60c9913dbb5ac6a228676b3ffa6087333ac2fd -MD5 3c04aab0fb07f750984a778270307438 ChangeLog 46467 -RMD160 5745313783e2f1532884d890077a752f0d48a5af ChangeLog 46467 -SHA256 bf9d1efa843fc9fdee5744036b60c9913dbb5ac6a228676b3ffa6087333ac2fd ChangeLog 46467 +MISC ChangeLog 46930 RMD160 3ebb1e8efc0de2a83c46bfc1d68036762a79c877 SHA1 43e03affde58b83cc494567fb9739425641546ca SHA256 517eee42abce8f22fa0be6cf38c05705ffd9ec43f8e6adc1b166152d6953b0e2 +MD5 889a9bd492c071020cdc124b028c15ce ChangeLog 46930 +RMD160 3ebb1e8efc0de2a83c46bfc1d68036762a79c877 ChangeLog 46930 +SHA256 517eee42abce8f22fa0be6cf38c05705ffd9ec43f8e6adc1b166152d6953b0e2 ChangeLog 46930 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447 @@ -315,13 +335,16 @@ SHA256 b3f9795c890f236bb5fea71fd0bb360921ad749c65c0f1163c0b9dc0f8ff098d files/di MD5 0a038fef39f2c8ccb4a613719e0f817b files/digest-udev-103 229 RMD160 fd217b32f070097ae37ba5ee5a96a84faab5edef files/digest-udev-103 229 SHA256 7638db47ed884246551e3d27d9be0fd088c0db9a7e92c3359efa901a87742a28 files/digest-udev-103 229 +MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r10 229 +RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r10 229 +SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r10 229 MD5 834e944e237e0d9501aac75e61c50eb1 files/digest-udev-104-r9 229 RMD160 7fd47bd560da91a9953657f31d6cd2383d2032cb files/digest-udev-104-r9 229 SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/digest-udev-104-r9 229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFy0aIkT4lNIS36YERAgzpAJ0WWfGsjVUsbvEYMtCjWZpgX5XUAQCgs7+V -HS33YUZhWvPZL56QIjD8pQ4= -=cMUQ +iD8DBQFFzkcJt2vP6XvVdOcRAtxKAKDKF9+6mDLyGBTTWJSgN2O7+c0QmgCg4d9u +Be4Bzv1114WrOx2WrdcNH9I= +=/QUC -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/digest-udev-104-r10 b/sys-fs/udev/files/digest-udev-104-r10 new file mode 100644 index 000000000000..1d88fbeee74a --- /dev/null +++ b/sys-fs/udev/files/digest-udev-104-r10 @@ -0,0 +1,3 @@ +MD5 9bcfc782d40db2b406a9c1172defda8f udev-104.tar.bz2 187574 +RMD160 269aeb9a0b2043d18c274fde749d2e0d30398b73 udev-104.tar.bz2 187574 +SHA256 ec0e7bd0c322dce6149d5f94185aa477659f5030a3d684ff5428124eca684ea1 udev-104.tar.bz2 187574 diff --git a/sys-fs/udev/files/modprobe.sh b/sys-fs/udev/files/modprobe.sh new file mode 100755 index 000000000000..9a2d9ce8a5d2 --- /dev/null +++ b/sys-fs/udev/files/modprobe.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +VERBOSE=no +[[ -e /dev/.udev_populate ]] && VERBOSE=yes + +source /sbin/functions.sh /dev/console + fi +fi + +# now do real loading +exec "${MODPROBE}" "${@}" diff --git a/sys-fs/udev/files/net-104-r10.sh b/sys-fs/udev/files/net-104-r10.sh new file mode 100755 index 000000000000..f9f51aa11672 --- /dev/null +++ b/sys-fs/udev/files/net-104-r10.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# +# net.sh: udev external RUN script +# +# Copyright 2007 Roy Marples +# Distributed under the terms of the GNU General Public License v2 + +IFACE=$1 +ACTION=$2 + +SCRIPT=/etc/init.d/net.$IFACE + +# ignore interfaces that are registered after being "up" (?) +case ${IFACE} in + ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*) + exit 0 ;; +esac + +if [ ! -x "${SCRIPT}" ] ; then + logger -t udev-net.sh "${SCRIPT}: does not exist or is not executable" + exit 1 +fi + +# If we're stopping then sleep for a bit in-case a daemon is monitoring +# the interface. This to try and ensure we stop after they do. +[ "${ACTION}" == "stop" ] && sleep 2 + +IN_HOTPLUG=1 "${SCRIPT}" --quiet "${ACTION}" diff --git a/sys-fs/udev/files/udev-start-104-r10.sh b/sys-fs/udev/files/udev-start-104-r10.sh new file mode 100644 index 000000000000..67ffaacb7c0c --- /dev/null +++ b/sys-fs/udev/files/udev-start-104-r10.sh @@ -0,0 +1,152 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +udev_version() { + # Version number copied in by ebuild + local version=@@UDEV_VERSION@@ + version=${version##0} + + echo "${version}" +} + +populate_udev() { + # populate /dev with devices already found by the kernel + touch /dev/.udev_populate + if [ $(get_KV) -gt "$(KV_to_int '2.6.14')" ] ; then + ebegin "Populating /dev with existing devices through uevents" + local opts= + [[ ${RC_COLDPLUG} != "yes" && $(udev_version) -ge "96" ]] && \ + opts="--attr-match=dev" + /sbin/udevtrigger ${opts} + eend $? + else + ebegin "Populating /dev with existing devices with udevstart" + /sbin/udevstart + eend $? + fi + + # loop until everything is finished + # there's gotta be a better way... + ebegin "Letting udev process events" + /sbin/udevsettle --timeout=60 + eend $? + + rm /dev/.udev_populate + return 0 +} + +seed_dev() { + # Seed /dev with some things that we know we need + ebegin "Seeding /dev with needed nodes" + + # if /dev/console is missing on root-partition, + # kernel could not open it and we need to do that for + # udevd (Bug #151414) + mknod /dev/console c 5 1 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + mknod /dev/null c 1 3 + + # copy over any persistant things + if [[ -d /lib/udev/devices ]] ; then + cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2>/dev/null + fi + + # Not provided by sysfs but needed + ln -snf /proc/self/fd /dev/fd + ln -snf fd/0 /dev/stdin + ln -snf fd/1 /dev/stdout + ln -snf fd/2 /dev/stderr + [[ -e /proc/kcore ]] && ln -snf /proc/kcore /dev/core + + # Create problematic directories + mkdir -p /dev/{pts,shm} + eend 0 +} + +main() { + # check if /dev/console exists outside tmpfs + [[ -c /dev/console ]] ; local need_redirect=$? + + # Setup temporary storage for /dev + ebegin "Mounting /dev for udev" + if [[ ${RC_USE_FSTAB} == "yes" ]] ; then + mntcmd=$(get_mount_fstab /dev) + else + unset mntcmd + fi + if [[ -n ${mntcmd} ]] ; then + try mount -n ${mntcmd} + else + # This is bash only, but saves on using grep + if [[ $( /selinux/null + fi + + # Actually get udev rolling + if [[ ${RC_DEVICE_TARBALL} == "yes" && \ + -s /lib/udev/state/devices.tar.bz2 ]] ; then + ebegin "Populating /dev with saved device nodes" + try tar -jxpf /lib/udev/state/devices.tar.bz2 -C /dev + eend $? + fi + + seed_dev + + # Setup hotplugging (if possible) + if [[ -e /proc/sys/kernel/hotplug ]] ; then + ebegin "Setting up proper hotplug agent" + eindent + if [[ $(get_KV) -gt $(KV_to_int '2.6.14') ]] ; then + einfo "Using netlink for hotplug events..." + echo "" > /proc/sys/kernel/hotplug + else + einfo "Setting /sbin/udevsend as hotplug agent ..." + echo "/sbin/udevsend" > /proc/sys/kernel/hotplug + fi + eoutdent + eend 0 + fi + + ebegin "Starting udevd" + if [[ ${need_redirect} == 1 ]]; then + # we need to open fds 0 1 2 to solve Bug #151414 + /sbin/udevd --daemon /dev/console 2>/dev/console + else + /sbin/udevd --daemon + fi + eend $? + + populate_udev + + # Create nodes that udev can't + ebegin "Finalizing udev configuration" + [[ -x /sbin/dmsetup ]] && /sbin/dmsetup mknodes &>/dev/null + [[ -x /sbin/lvm ]] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [[ -z ${CDBOOT} ]] && [[ -x /sbin/evms_activate ]] && \ + /sbin/evms_activate -q &>/dev/null + eend 0 +} + +main + +# vim:ts=4 diff --git a/sys-fs/udev/files/udev.rules-104-r10 b/sys-fs/udev/files/udev.rules-104-r10 new file mode 100644 index 000000000000..9701a2bb1df3 --- /dev/null +++ b/sys-fs/udev/files/udev.rules-104-r10 @@ -0,0 +1,303 @@ +# /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="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" + +# 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" + +# 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", GROUP="usb", MODE="0664" + + +# Module autoloading + +# Autoload modules that lack aliases but have them defined inutoload modules +ENV{MODALIAS}=="?*", ACTION=="add", RUN+="modprobe.sh $env{MODALIAS}" + +# /etc/modprobe.conf. +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do modprobe.sh 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 + + +# 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 + +# 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'" + +# assign cdrom-permission also to associated generic device +KERNEL=="sg[0-9]*", ACTION=="add", ATTRS{type}=="4|5", GROUP="cdrom" + +# Load driver for scsi-device +ACTION=="add", SUBSYSTEM=="scsi_device", RUN+="modprobe.sh sg" +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="0|7|14", \ + RUN+="modprobe.sh sd_mod" +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="4|5", \ + RUN+="modprobe.sh sr_mod" + +ACTION=="add", SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ENV{ID_SCSI_TAPE_DRIVER}="st" +ACTION=="add", SUBSYSTEM=="scsi_device", 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}" + + +# 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-104-r10.ebuild b/sys-fs/udev/udev-104-r10.ebuild new file mode 100644 index 000000000000..ddc5e939aff0 --- /dev/null +++ b/sys-fs/udev/udev-104-r10.ebuild @@ -0,0 +1,278 @@ +# 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-104-r10.ebuild,v 1.1 2007/02/10 22:28:14 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 ~s390 ~sh sparc x86" +IUSE="selinux" + +DEPEND="selinux? ( sys-libs/libselinux )" +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 + epatch ${FILESDIR}/${P}-netif-rename-busywait.patch + epatch ${FILESDIR}/${PN}-104-peristent-net-disable-xen.patch + epatch ${FILESDIR}/${PN}-105-vol_id-fix.patch + epatch ${FILESDIR}/${PN}-105-unlink-db-files.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" + + # 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 + keepdir /lib/udev/devices + + # 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" + doexe ${FILESDIR}/modprobe.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-104-r10 50-udev.rules + newins ${FILESDIR}/05-udev-early.rules-104-r5 05-udev-early.rules + doins ${FILESDIR}/95-net.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 + 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/dasd_id/dasd_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 /lib/rcscripts/addons + newins "${FILESDIR}"/udev-start-104-r10.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-104-r8.sh udev-stop.sh + + # Insert udev-version number into udev-rcscript addon + sed -e "s/@@UDEV_VERSION@@/${PV}/" \ + -i "${D}"/lib/rcscripts/addons/udev-start.sh \ + -i "${D}"/lib/rcscripts/addons/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 +} + +pkg_postinst() { + if [[ ${ROOT} == "/" ]] ; then + if [[ -n $(pidof udevd) ]] ; then + killall -15 udevd &>/dev/null + sleep 1 + killall -9 udevd &>/dev/null + fi + /sbin/udevd --daemon + 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 "