diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2008-05-19 12:23:12 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-05-19 12:23:12 +0000 |
commit | 59417dc3de607b122e61474130df030bb836e615 (patch) | |
tree | 0e3c83502755bc88782dc859e98387147659efe8 /sys-fs/udev | |
parent | Removed old syntax from modprobe config file. (diff) | |
download | historical-59417dc3de607b122e61474130df030bb836e615.tar.gz historical-59417dc3de607b122e61474130df030bb836e615.tar.bz2 historical-59417dc3de607b122e61474130df030bb836e615.zip |
Version bumped. Needed to change udev-start to use udevadm subcommands instead of standalone ones (udevtrigger, udevsettle).
Package-Manager: portage-2.1.5
Diffstat (limited to 'sys-fs/udev')
-rw-r--r-- | sys-fs/udev/ChangeLog | 9 | ||||
-rw-r--r-- | sys-fs/udev/Manifest | 11 | ||||
-rw-r--r-- | sys-fs/udev/files/udev-start-122.sh | 235 | ||||
-rw-r--r-- | sys-fs/udev/udev-122.ebuild | 350 |
4 files changed, 600 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index c470dafb37eb..71e956694e18 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.384 2008/05/14 15:36:46 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.385 2008/05/19 12:23:11 zzam Exp $ + +*udev-122 (19 May 2008) + + 19 May 2008; Matthias Schwarzott <zzam@gentoo.org> + +files/udev-start-122.sh, +udev-122.ebuild: + Version bumped. Needed to change udev-start to use udevadm subcommands + instead of standalone ones (udevtrigger, udevsettle). *udev-121 (14 May 2008) diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 83c22f3aba9d..ee4d283facc8 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -50,6 +50,7 @@ AUX udev-start-115-r6.sh 5237 RMD160 47b9b267d99dae5c02ddea3145beb5ad39e990de SH AUX udev-start-118-r1.sh 5353 RMD160 159826d39461d4c01256b0247c4c27a44abf16dd SHA1 8b5a0738df2adf4650840d1c62d2d79b55ae95ae SHA256 3145a511043ddf6909743ff01a4c5375025932367df8862d5e453561793526f6 AUX udev-start-118-r2.sh 5072 RMD160 24b469dc45b70b6eac82ae3a32f1fb8b0d062c5f SHA1 259ffce13605ad5dd4495926862a1c30ed9c1b51 SHA256 90b6a7616767facf64bcc21563f7333f63633044c24fa56f6ca5647c5b8ee5dc AUX udev-start-119-r1.sh 5645 RMD160 f2d4e694f53ed70ab9c6d3596cf7ea19e50464e1 SHA1 b3bfde334346bf589a7976c78f28595095ca2909 SHA256 c06633599441a32877500c8a6fcc502be04935a51a8e2cf7f093ee8da34e45e0 +AUX udev-start-122.sh 5661 RMD160 205541b218d3075a93fd0b646f7b169d44c60e91 SHA1 3ca0a45d76c0b10dd03907835fcab270b7d45f99 SHA256 ee6a2d14be379a91eac63446404dd69d8a2aced37843d8fbf2434ea6e7eca9d0 AUX udev-stop-104-r13.sh 3213 RMD160 aedef1ca5fe853eb3f5a774f354dc36dccbd31e5 SHA1 0ced2a331cf516019326d87e2b3c7978d2c02d23 SHA256 2762507dc5a640eb66823a87402d1ddae9c3430b47f69ff95a7e55f7c2f95be9 AUX udev-stop-104-r8.sh 3208 RMD160 76a1fa5ce68250710c79e141d76d83b3331a4f2e SHA1 78ec2b84513e9acba286dd5abb95e21f6d54d999 SHA256 5b1eb2912a33987eae9502297f804a189e14e41498b7ea08d97423bcfb2e2f2c AUX udev-stop-110-r1.sh 2792 RMD160 2e91f2b3c71d1c9efd0fcf2b29330845abaa2948 SHA1 f76f618d9581530be3f62fedbf2f01be97f0c5ad SHA256 38df53470d073d14a28b2b56f2c1c3ec94d21bc9c75c0fec9549200f389e841f @@ -74,6 +75,7 @@ DIST udev-118.tar.bz2 199852 RMD160 1adcd06bbf8ecae59890981b38415eb4b72109c1 SHA DIST udev-119.tar.bz2 201836 RMD160 b827a1a5697fa32e43dec0a08081e92e2eddda52 SHA1 ae0d35a99e9f1983c1069378fd9d561de26cee7e SHA256 3bbab9b7f5e733a4c0a1da164e58511608014a3c5f0a4e8487c90d10c2a57349 DIST udev-120.tar.bz2 203285 RMD160 a03e36e55953b296eaefaac242b1e5f1adda5254 SHA1 cef4c26390d158abcca135023cd88686271e8bc7 SHA256 6e2d07bf09f0c5d494b9139b2aa194ed7534bf7fb6f4dd732ed0cb725cde7b23 DIST udev-121.tar.bz2 206790 RMD160 8b22e419eb926fa28c4c694bc8db895cb3506c06 SHA1 d194517d9466e302519a301d6c1e2579247692e1 SHA256 8ed32bf37539904e8b8eec7dafe9e5705734d574960d123f916eecbc44712b43 +DIST udev-122.tar.bz2 207332 RMD160 0e6737d26eb245b3438c1f26e2350de8cc780aee SHA1 4079b2d5149b8f532c1d2e54182380605f634806 SHA256 c1214ca514c6175129534e9d5ba6dfa55d4f3613f5cb68ae3f36788275720e00 EBUILD udev-114-r1.ebuild 8816 RMD160 d2a452752aa4a4cfe553d9182b9b624c6df861dd SHA1 dc781d45759efbfb695bc613c535bc5ab5d02c7c SHA256 77595d8e14f232b1d941d37e9e064fc19eaaf61859ab8da0018de3cef9c557aa EBUILD udev-114-r2.ebuild 9303 RMD160 755b62df4a003f60b90e774d634639618086ab71 SHA1 62ba06fd2430813a706a1fb8cd429455e71c5d7b SHA256 d19dd1c12b032a4107c4e9f4c03aa90071198563e3fe602baffd86341fb5a688 EBUILD udev-114.ebuild 8733 RMD160 53c0f674b1c6ad2377b11a4b26c85648f90ff23c SHA1 00f7da1a1f3c93149437d987ca8f0d8359279175 SHA256 843cccf1aded2f888c99c0a87065700e55b97b4c817304b88bc27132978c83bc @@ -92,12 +94,13 @@ EBUILD udev-119-r1.ebuild 9866 RMD160 976da2e1e5ae267df2ebd106fcb7648bfb791e83 S EBUILD udev-119.ebuild 9859 RMD160 e80177ac372c87f91fcf9a0f65ff6194d5f4a07f SHA1 3f8f8f4858babb8f1f2abf87a8fa246d45a36b45 SHA256 f74a6e4e43d286aed9cc0c7712fd74c155b5864aecbaf2fb5ae25f34761abd81 EBUILD udev-120.ebuild 9863 RMD160 a64b7c4e56a24220f35217cebe2809af2bcacd44 SHA1 36005b13221ba23c04cfecd03a67b46930fff704 SHA256 6c7a4a5319aed7bc307fabe5edeae9293b752f9999b5dcfefa8cd5f4272b64ff EBUILD udev-121.ebuild 9913 RMD160 56c886bdaa0e3daac0b3238b8f89b534c5b447eb SHA1 551de0443de1186e78520ce3b385b0bf907f27c0 SHA256 91cb26651a7f21a199cd7f50190a5a29b1afa7fc13e48cdb43ca3aa1a6191253 -MISC ChangeLog 76869 RMD160 4a1944405280067d30a8b3b0aafae55a881f0fec SHA1 2e301b3317777c74615722a9f2df2734a21fbd5b SHA256 8bde52ee397e3b37fcdf5f878d62a83459d6d7402f67bb180ae1dbb11b3180c1 +EBUILD udev-122.ebuild 9860 RMD160 dc70d72489d33cb182d059cc9b33f9ebf147d576 SHA1 069b7baf6db75f0b53b5f6eb83fd4f5e9edc3027 SHA256 339638594a0e81bff3f0c006e26478cbb3f893ee37c4d1b05ad0c643113c7dc1 +MISC ChangeLog 77123 RMD160 58dbadba8e79b9d3ee41f92469d6e1b54d95b59a SHA1 3dfa4db79df9621972f5027026902ba554afe4ff SHA256 446217a4a262ff7cc1bb5199cc9fb4e637d2af2f458b0f08e6b4e78476328357 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkgrByQACgkQt2vP6XvVdOf+zQCgpYury+tXZouLN8/TAIV0oztI -mg4AnjwRiMZPZrpJrUCFYizKxzeEhwxW -=56OY +iEYEARECAAYFAkgxcTUACgkQt2vP6XvVdOdH2gCfZcIxqmDzbPuJ46TGiugKEEMM +4rQAn0HlHT+GpfQjBIgTcGqg61nNRiHX +=b7j7 -----END PGP SIGNATURE----- diff --git a/sys-fs/udev/files/udev-start-122.sh b/sys-fs/udev/files/udev-start-122.sh new file mode 100644 index 000000000000..0fbf229a3c5a --- /dev/null +++ b/sys-fs/udev/files/udev-start-122.sh @@ -0,0 +1,235 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/udev/udev.conf ] && . /etc/udev/udev.conf +. /lib/udev/shell-compat.sh + +rc_coldplug=${rc_coldplug:-${RC_COLDPLUG:-YES}} +rc_device_tarball=${rc_device_tarball:-${RC_DEVICE_TARBALL:-NO}} + +cleanup() +{ + # fail more gracely and not leave udevd running + start-stop-daemon --stop --exec /sbin/udevd + exit 1 +} + +# FIXME +# Instead of this script testing kernel version, udev itself should +# Maybe something like udevd --test || exit $? +check_kernel() +{ + if [ $(get_KV) -lt $(KV_to_int '2.6.15') ]; then + eerror "Your kernel is too old to work with this version of udev." + eerror "Current udev only supports Linux kernel 2.6.15 and newer." + return 1 + fi + if [ $(get_KV) -lt $(KV_to_int '2.6.18') ]; then + ewarn "You need at least Linux kernel 2.6.18 for reliable operation of udev." + fi + return 0 +} + + +mount_dev_directory() +{ + # No options are processed here as they should all be in /etc/fstab + ebegin "Mounting /dev" + if fstabinfo --quiet /dev; then + mount -n /dev + else + # Some devices require exec, Bug #92921 + mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" udev /dev + fi + eend $? +} + +unpack_device_tarball() +{ + local device_tarball=/lib/udev/state/devices.tar.bz2 + if yesno "${rc_device_tarball}" && \ + [ -s "${device_tarball}" ] + then + ebegin "Populating /dev with saved device nodes" + tar -jxpf "${device_tarball}" -C /dev + eend $? + fi +} + +seed_dev() +{ + # Seed /dev with some things that we know we need + + # creating /dev/console and /dev/tty1 to be able to write + # to $CONSOLE with/without bootsplash before udevd creates it + [ -c /dev/console ] || mknod /dev/console c 5 1 + [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 + + # udevd will dup its stdin/stdout/stderr to /dev/null + # and we do not want a file which gets buffered in ram + [ -c /dev/null ] || mknod /dev/null c 1 3 + + # copy over any persistant things + if [ -d /lib/udev/devices ]; then + cp -RPp /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 /dev/shm + return 0 +} + +disable_hotplug_agent() +{ + if [ -e /proc/sys/kernel/hotplug ]; then + echo "" >/proc/sys/kernel/hotplug + fi +} + +root_link() +{ + /lib/udev/write_root_link_rule +} + +start_udevd() +{ + ebegin "Starting udevd" + start-stop-daemon --start --exec /sbin/udevd -- --daemon + eend $? +} + +# populate /dev with devices already found by the kernel +populate_dev() +{ + if get_bootparam "nocoldplug" ; then + rc_coldplug="NO" + ewarn "Skipping udev coldplug as requested in kernel cmdline" + fi + + ebegin "Populating /dev with existing devices through uevents" + if yesno "${rc_coldplug}"; then + udevadm trigger + else + # Do not run any init-scripts, Bug #206518 + udevadm control --env do_not_run_plug_service=1 + + # only create device nodes + udevadm trigger --attr-match=dev + + # run persistent-net stuff, bug 191466 + udevadm trigger --subsystem-match=net + fi + eend $? + + ebegin "Waiting for uevents to be processed" + udevadm settle --timeout=60 + eend $? + + udevadm control --env do_not_run_plug_service= + return 0 +} + +compat_volume_nodes() +{ + # Only do this for baselayout-1* + if [ ! -e /lib/librc.so ]; then + + # Create nodes that udev can't + [ -x /sbin/lvm ] && \ + /sbin/lvm vgscan -P --mknodes --ignorelockingfailure &>/dev/null + # Running evms_activate on a LiveCD causes lots of headaches + [ -z "${CDBOOT}" -a -x /sbin/evms_activate ] && \ + /sbin/evms_activate -q &>/dev/null + fi +} + +check_persistent_net() +{ + # check if there are problems with persistent-net + local syspath= devs= problem=false + for syspath in /sys/class/net/*_rename*; do + if [ -d "${syspath}" ]; then + devs="${devs} ${syspath##*/}" + problem=true + fi + done + + ${problem} || return 0 + + eerror "UDEV: Your system has a problem assigning persistent names" + eerror "to these network interfaces: ${devs}" + + einfo "Checking persistent-net rules:" + # the sed-expression lists all duplicate lines + # from the input, like "uniq -d" does, but uniq + # is installed into /usr/bin and not available at boot. + dups=$( + RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' + . /lib/udev/rule_generator.functions + find_all_rules 'NAME=' '.*' | \ + tr ' ' '\n' | \ + sort | \ + sed '$!N; s/^\(.*\)\n\1$/\1/; t; D' + ) + if [ -n "${dups}" ]; then + ewarn "The rules create multiple entries assigning these names:" + eindent + ewarn "${dups}" + eoutdent + else + ewarn "Found no duplicate names in persistent-net rules," + ewarn "there must be some other problem!" + fi + return 1 +} + +check_udev_works() +{ + # should exist on every system, else udev failed + if [ ! -e /dev/zero ]; then + eerror "Assuming udev failed somewhere, as /dev/zero does not exist." + return 1 + fi + return 0 +} + + + +check_kernel || cleanup +mount_dev_directory || cleanup + +# Create a file so that our rc system knows it's still in sysinit. +# Existance means init scripts will not directly run. +# rc will remove the file when done with sysinit. +touch /dev/.rcsysinit + +# Selinux lovin; /selinux should be mounted by selinux-patched init +if [ -x /sbin/restorecon -a -c /selinux/null ]; then + restorecon /dev > /selinux/null +fi + +unpack_device_tarball +seed_dev +root_link +disable_hotplug_agent + +start_udevd || cleanup +populate_dev || cleanup + +compat_volume_nodes +check_persistent_net + +# trigger executing initscript when /etc is writable +IN_HOTPLUG=1 /etc/init.d/udev-postmount start >/dev/null 2>&1 + +check_udev_works || cleanup + +# udev started successfully +exit 0 diff --git a/sys-fs/udev/udev-122.ebuild b/sys-fs/udev/udev-122.ebuild new file mode 100644 index 000000000000..6e4635210b89 --- /dev/null +++ b/sys-fs/udev/udev-122.ebuild @@ -0,0 +1,350 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-122.ebuild,v 1.1 2008/05/19 12:23:11 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs versionator + +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 + !<sys-fs/device-mapper-1.02.19-r1" +RDEPEND="${DEPEND} ${RDEPEND} + >=sys-apps/baselayout-1.12.5" +# We need the lib/rcscripts/addon support +PROVIDE="virtual/dev-manager" + +pkg_setup() { + udev_helper_dir="/$(get_libdir)/udev" + + myconf= + 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/collect \ + extras/rule_generator" + + use selinux && myconf="${myconf} USE_SELINUX=true" + + # comparing kernel version without linux-info.eclass to not pull + # virtual/linux-sources + + local KV=$(uname -r) + local KV_MAJOR=$(get_major_version ${KV}) + local KV_MINOR=$(get_version_component_range 2 ${KV}) + local KV_MICRO=$(get_version_component_range 3 ${KV}) + + local ok=0 + if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 && ${KV_MICRO} -ge 18 ]] + then + ok=1 + fi + + if [[ ${ok} == 0 ]] + then + ewarn + ewarn "${P} does not support Linux kernel before version 2.6.15!" + ewarn "If you want to use udev reliable you should update" + ewarn "to at least kernel version 2.6.18!" + ewarn + ebeep + fi +} + +sed_helper_dir() { + sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@" +} + +src_unpack() { + unpack ${A} + + cd "${S}" + + # patches go here... + + # 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 + # Do not require xmlto to refresh manpages + sed -ie 's|$(MAN_PAGES)||g' Makefile + + # Make sure there is no sudden changes to upstream rules file + # (more for my own needs than anything else ...) + MD5=$(md5sum < "${S}/etc/udev/rules.d/50-udev-default.rules") + MD5=${MD5/ -/} + if [[ ${MD5} != db44f7e02100f57a555d48e2192c3f8d ]] + then + echo + eerror "50-udev-default.rules has been updated, please validate!" + die "50-udev-default.rules has been updated, please validate!" + fi + + sed_helper_dir \ + etc/udev/rules.d/50-udev-default.rules \ + extras/rule_generator/write_*_rules \ + udev_rules_parse.c \ + udev_rules.c + + # Use correct multilib dir + sed -i extras/volume_id/lib/Makefile \ + -e "/ =/s-/lib-/$(get_libdir)-" +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + + if [[ -z ${extras} ]]; then + eerror "Variable extras is unset!" + eerror "It seems you suffer from Bug #190994" + die "Variable extras is unset!" + fi + + # Not everyone has full $CHOST-{ld,ar,etc...} yet + local mycross="" + type -p ${CHOST}-ar && mycross=${CHOST}- + + emake \ + EXTRAS="${extras}" \ + libudevdir=${udev_helper_dir} \ + CROSS_COMPILE=${mycross} \ + OPTFLAGS="" \ + ${myconf} || die "compiling udev failed" +} + +src_install() { + into / + emake \ + DESTDIR="${D}" \ + libudevdir=${udev_helper_dir} \ + EXTRAS="${extras}" \ + ${myconf} \ + install || die "make install failed" + + exeinto "${udev_helper_dir}" + newexe "${FILESDIR}"/net-118-r1.sh net.sh || die "net.sh not installed properly" + newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \ + || die "move_tmp_persistent_rules.sh not installed properly" + doexe "${FILESDIR}"/write_root_link_rule \ + || die "write_root_link_rule not installed properly" + newexe "${FILESDIR}"/shell-compat-118-r3.sh shell-compat.sh \ + || die "shell-compat.sh not installed properly" + + keepdir "${udev_helper_dir}"/state + keepdir "${udev_helper_dir}"/devices + + # create symlinks for these utilities to /sbin + # where multipath-tools expect them to be (Bug #168588) + dosym "..${udev_helper_dir}/vol_id" /sbin/vol_id + dosym "..${udev_helper_dir}/scsi_id" /sbin/scsi_id + + # vol_id library (needed by mount and HAL) + into / + rm "${D}/$(get_libdir)"/libvolume_id.so* 2>/dev/null + dolib extras/volume_id/lib/*.so* || die "Failed installing libvolume_id.so" + into /usr + dolib extras/volume_id/lib/*.a || die "Failed installing libvolume_id.a" + + # handle static linking bug #4411 + rm -f "${D}/usr/$(get_libdir)/libvolume_id.so" + gen_usr_ldscript libvolume_id.so + + # Add gentoo stuff to udev.conf + echo "# If you need to change mount-options, do it in /etc/fstab" \ + >> "${D}"/etc/udev/udev.conf + + # Now installing rules + cd etc/udev + insinto /etc/udev/rules.d/ + + # Our rules files + doins gentoo/??-*.rules + doins packages/40-alsa.rules + + # Adding arch specific rules + if [[ -f packages/40-${ARCH}.rules ]] + then + doins "packages/40-${ARCH}.rules" + fi + cd "${S}" + + # our udev hooks into the rc system + insinto /$(get_libdir)/rcscripts/addons + newins "${FILESDIR}"/udev-start-122.sh udev-start.sh + newins "${FILESDIR}"/udev-stop-118-r2.sh udev-stop.sh + + # The udev-post init-script + newinitd "${FILESDIR}"/udev-postmount-initd-111-r2 udev-postmount + + insinto /etc/modprobe.d + newins "${FILESDIR}"/blacklist-110 blacklist + doins "${FILESDIR}"/pnp-aliases + + # convert /lib/udev to real used dir + sed_helper_dir \ + "${D}/$(get_libdir)"/rcscripts/addons/*.sh \ + "${D}"/etc/init.d/udev* \ + "${D}"/etc/modprobe.d/* + + # documentation + dodoc ChangeLog FAQ README TODO RELEASE-NOTES + dodoc docs/{overview,udev_vs_devfs} + + cd docs/writing_udev_rules + mv index.html writing_udev_rules.html + dohtml *.html + + cd "${S}" + + newdoc extras/volume_id/README README_volume_id + + echo "CONFIG_PROTECT_MASK=\"/etc/udev/rules.d\"" > 20udev + doenvd 20udev +} + +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 && + ! -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() { + # 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" && + [[ -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 + + # 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 2>/dev/null + fi + + if has_version "<sys-fs/udev-106-r5" && + [[ -e ${ROOT}/etc/udev/rules.d/95-net.rules ]] + then + rm -f "${ROOT}"/etc/udev/rules.d/95-net.rules + fi + + # Try to remove /etc/dev.d as that is obsolete + if [[ -d ${ROOT}/etc/dev.d ]] + then + rmdir --ignore-fail-on-non-empty "${ROOT}"/etc/dev.d/default "${ROOT}"/etc/dev.d 2>/dev/null + if [[ -d ${ROOT}/etc/dev.d ]] + then + ewarn "You still have the directory /etc/dev.d on your system." + ewarn "This is no longer used by udev and can be removed." + fi + fi + + # 64-device-mapper.rules now gets installed by sys-fs/device-mapper + # remove it if user don't has sys-fs/device-mapper installed + if has_version "<sys-fs/udev-113" && + [[ -f ${ROOT}/etc/udev/rules.d/64-device-mapper.rules ]] && + ! has_version sys-fs/device-mapper + then + rm -f "${ROOT}"/etc/udev/rules.d/64-device-mapper.rules + einfo "Removed unneeded file 64-device-mapper.rules" + fi + + if [[ ${ROOT} == / ]] + then + # check if root of init-process is identical to ours + if [[ -r /proc/1/root && /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 + + ewarn "If you build an initramfs including udev, then please" + ewarn "make sure that the /sbin/udevadm binary gets included," + ewarn "as the helper apps udevinfo, udevtrigger, ... are now" + ewarn "only symlinks to udevadm." + + ewarn + ewarn "mount options for directory /dev are no longer" + ewarn "set in /etc/udev/udev.conf, but in /etc/fstab" + ewarn "as for other directories." + + elog + elog "For more information on udev on Gentoo, writing udev rules, and" + elog " fixing known issues visit:" + elog " http://www.gentoo.org/doc/en/udev-guide.xml" +} |