summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-10-21 20:35:33 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-10-21 20:35:33 +0000
commit0bc90d8d9605b85720f510df0e8937df85e1cb5c (patch)
tree451af91552414a06e0acc170db64a74be20c0370 /sys-fs
parentamd64 stable, bug 195443 (diff)
downloadhistorical-0bc90d8d9605b85720f510df0e8937df85e1cb5c.tar.gz
historical-0bc90d8d9605b85720f510df0e8937df85e1cb5c.tar.bz2
historical-0bc90d8d9605b85720f510df0e8937df85e1cb5c.zip
udev-rules update. Fixes bugs #195607 #195728 #195839.
Package-Manager: portage-2.1.3.15
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/ChangeLog8
-rw-r--r--sys-fs/udev/Manifest29
-rw-r--r--sys-fs/udev/files/digest-udev-116-r13
-rw-r--r--sys-fs/udev/files/udev-116-gentoo-rules-update.diff35
-rw-r--r--sys-fs/udev/udev-116-r1.ebuild341
5 files changed, 411 insertions, 5 deletions
diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index ed3781e0ebea..4a8c0812ab90 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,12 @@
# 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.363 2007/10/15 06:11:38 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.364 2007/10/21 20:35:32 zzam Exp $
+
+*udev-116-r1 (21 Oct 2007)
+
+ 21 Oct 2007; Matthias Schwarzott <zzam@gentoo.org>
+ +files/udev-116-gentoo-rules-update.diff, +udev-116-r1.ebuild:
+ udev-rules update. Fixes bugs #195607 #195728 #195839.
15 Oct 2007; Tom Gall <tgall@gentoo.org> udev-115-r1.ebuild:
stable on ppc64, bug #195289
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9a98852fb698..fe7c7e52c933 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-104-r5 567 RMD160 8c7e021cc1f733d59c21f7f09ff74471b15f3ade SHA1 842021003645319d163202ab00aae39f219261ea SHA256 ecbcbbdb32c7530f2cadba10590826cc1abd176cc52cece7c53a5bd821a65bc8
MD5 f10916c6977dc9cbd935154358974196 files/05-udev-early.rules-104-r5 567
RMD160 8c7e021cc1f733d59c21f7f09ff74471b15f3ade files/05-udev-early.rules-104-r5 567
@@ -122,6 +125,10 @@ AUX udev-115-update-gentoo-rules-2.diff 488 RMD160 4b2c7f44f413564559506adbe6510
MD5 2fd94a19780bfa5814d31a2d7968bc89 files/udev-115-update-gentoo-rules-2.diff 488
RMD160 4b2c7f44f413564559506adbe6510baed0615075 files/udev-115-update-gentoo-rules-2.diff 488
SHA256 a33e874108f809b408b3475af0ff448e680a796a36e1d78f440cffb4e1781fc0 files/udev-115-update-gentoo-rules-2.diff 488
+AUX udev-116-gentoo-rules-update.diff 1250 RMD160 2b32387fb5df131ebf7a0cd0e3ee092f09700094 SHA1 03aa96b721a51baed3e7bc5ad3ba70810e485cc4 SHA256 4e6c08940b04f569b4b50ecb5e618d192ab8218d9ab87d54d06b65853367c5e1
+MD5 db5d51350eb13e619c01a04aaedc834b files/udev-116-gentoo-rules-update.diff 1250
+RMD160 2b32387fb5df131ebf7a0cd0e3ee092f09700094 files/udev-116-gentoo-rules-update.diff 1250
+SHA256 4e6c08940b04f569b4b50ecb5e618d192ab8218d9ab87d54d06b65853367c5e1 files/udev-116-gentoo-rules-update.diff 1250
AUX udev-116-path-to-logger.diff 421 RMD160 4613bbd35e780a509380ca1b386c59b0ac45f01d SHA1 8fe9c7fc11972fbeb20b9626cc00871d521d181c SHA256 f6b675716765df8e792027107bb51e10d07806244cea628a089c2579fad929eb
MD5 1f30c4b8232bffa21efb675207328916 files/udev-116-path-to-logger.diff 421
RMD160 4613bbd35e780a509380ca1b386c59b0ac45f01d files/udev-116-path-to-logger.diff 421
@@ -284,14 +291,18 @@ EBUILD udev-115.ebuild 9491 RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 SHA1
MD5 a223e37d05e117a40242e898ce94d6f7 udev-115.ebuild 9491
RMD160 8b5d98513a52edc00e77b0b347f7771917eb4898 udev-115.ebuild 9491
SHA256 5f503ab29fced876cff8eee825d5c4d366580c594a1fdb3050771eba6d7f8276 udev-115.ebuild 9491
+EBUILD udev-116-r1.ebuild 9564 RMD160 6105d0006b6573b772927049b8d176890a9212ed SHA1 d90029ca35b1c60572f1ab021daeea85e1c3d422 SHA256 45e16c8cc1bed19542de4c6fa76733719a942e41bb85b494419a71cbf6634282
+MD5 d22af13883f5d3bf9b2c8b03afc8a560 udev-116-r1.ebuild 9564
+RMD160 6105d0006b6573b772927049b8d176890a9212ed udev-116-r1.ebuild 9564
+SHA256 45e16c8cc1bed19542de4c6fa76733719a942e41bb85b494419a71cbf6634282 udev-116-r1.ebuild 9564
EBUILD udev-116.ebuild 9508 RMD160 d05543380def27f13237766a49eb05d9c664211a SHA1 e973dd091df8a76d0fe812e18c15ca792cb764c5 SHA256 98117809f80e652b8465c40699b5adc7c629ecbf998004404fd905fe4bf74582
MD5 ce25b09e1139b82ae3981d8a3b7171b2 udev-116.ebuild 9508
RMD160 d05543380def27f13237766a49eb05d9c664211a udev-116.ebuild 9508
SHA256 98117809f80e652b8465c40699b5adc7c629ecbf998004404fd905fe4bf74582 udev-116.ebuild 9508
-MISC ChangeLog 72599 RMD160 5802ccf423cd125e17c3e0a80c9daa730f605d4a SHA1 af6959133ef3f15c7daceb0fdc69e3d5b769d29f SHA256 917b05d79121a5ee5c4d73546d88c8980a1a50ccf5e86d7f6b560c7a645b7eb2
-MD5 d6dcc63a6468d6031505440f4d3fe3d8 ChangeLog 72599
-RMD160 5802ccf423cd125e17c3e0a80c9daa730f605d4a ChangeLog 72599
-SHA256 917b05d79121a5ee5c4d73546d88c8980a1a50ccf5e86d7f6b560c7a645b7eb2 ChangeLog 72599
+MISC ChangeLog 72802 RMD160 db69ddc0af252222ed623b6fa853d7a3c48984d6 SHA1 4bec921a663a617fab5048859fb8cd997f84406f SHA256 6416d2ef2b5a50693d00b6249537b54eac420b4a52023ce8304f40872787d7ec
+MD5 a0e8dc8a3953751efa0c3a92051da631 ChangeLog 72802
+RMD160 db69ddc0af252222ed623b6fa853d7a3c48984d6 ChangeLog 72802
+SHA256 6416d2ef2b5a50693d00b6249537b54eac420b4a52023ce8304f40872787d7ec ChangeLog 72802
MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -350,3 +361,13 @@ SHA256 2764eaa0da35789d9f0da08b664a3e51510e8159caa0f0a27e80306e7e79c4f4 files/di
MD5 328fb812cc39897dbbe3f70ae899c3f2 files/digest-udev-116 229
RMD160 8d51a39a607ee918b92801a1253334886fb71eaa files/digest-udev-116 229
SHA256 4446f4b16a3434e4dd028040a3f17fa387b41d0e366ab01e349414681a5f71cb files/digest-udev-116 229
+MD5 328fb812cc39897dbbe3f70ae899c3f2 files/digest-udev-116-r1 229
+RMD160 8d51a39a607ee918b92801a1253334886fb71eaa files/digest-udev-116-r1 229
+SHA256 4446f4b16a3434e4dd028040a3f17fa387b41d0e366ab01e349414681a5f71cb files/digest-udev-116-r1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHG7gft2vP6XvVdOcRAixmAKCrqx55wz+TwjV98IgXO7jdUDfJPACdGxv9
+8RNaopy3KwfJ1NA8LTxI2r8=
+=KKzh
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/files/digest-udev-116-r1 b/sys-fs/udev/files/digest-udev-116-r1
new file mode 100644
index 000000000000..cf1471ef2491
--- /dev/null
+++ b/sys-fs/udev/files/digest-udev-116-r1
@@ -0,0 +1,3 @@
+MD5 02c49d93ffda4a104c853c082138b835 udev-116.tar.bz2 199112
+RMD160 8c084fe4034e007ca66f0c102f41e9ada17bc46a udev-116.tar.bz2 199112
+SHA256 a28b5dc28e0e6b1e812e5b051205eaf3d9c3d299f8aecf3f915df1b76cb3b8a2 udev-116.tar.bz2 199112
diff --git a/sys-fs/udev/files/udev-116-gentoo-rules-update.diff b/sys-fs/udev/files/udev-116-gentoo-rules-update.diff
new file mode 100644
index 000000000000..445a8ddbe5a6
--- /dev/null
+++ b/sys-fs/udev/files/udev-116-gentoo-rules-update.diff
@@ -0,0 +1,35 @@
+Index: udev-git/etc/udev/gentoo/65-permissions.rules
+===================================================================
+--- udev-git.orig/etc/udev/gentoo/65-permissions.rules
++++ udev-git/etc/udev/gentoo/65-permissions.rules
+@@ -15,8 +15,12 @@ KERNEL=="st[0-9]*|nst[0-9]*|ht[0-9]*|nht
+ SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE="660"
+
+ # dialout devices
+-KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
++KERNEL=="ippp*|isdn*|dcbri*|capi*", GROUP="uucp"
+ KERNEL=="pilot", GROUP="uucp"
+
+ # sound devices (sound=alsa, snd=oss)
+ SUBSYSTEM=="sound|snd", GROUP="audio"
++
++# Sony Vaio Jogdial sonypi device
++KERNEL=="sonypi", MODE="0666"
++
+Index: udev-git/etc/udev/gentoo/40-gentoo.rules
+===================================================================
+--- /dev/null
++++ udev-git/etc/udev/gentoo/40-gentoo.rules
+@@ -0,0 +1,12 @@
++# do not edit this file, it will be overwritten on update
++
++# capi devices
++KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
++KERNEL=="capi*", NAME="capi/%n"
++
++# old devfs path, removing this could break systems
++# Bug 195839
++KERNEL=="md[0-9]*", NAME="md/%n", SYMLINK+="%k"
++KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k"
++KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
++
diff --git a/sys-fs/udev/udev-116-r1.ebuild b/sys-fs/udev/udev-116-r1.ebuild
new file mode 100644
index 000000000000..f633c7e5125c
--- /dev/null
+++ b/sys-fs/udev/udev-116-r1.ebuild
@@ -0,0 +1,341 @@
+# 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-116-r1.ebuild,v 1.1 2007/10/21 20:35:32 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 \
+ extras/root_link"
+
+ 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 15 ]]
+ 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 you need to update"
+ ewarn "to kernel >=2.6.15!"
+ ewarn
+ ebeep
+ fi
+}
+
+sed_helper_dir() {
+ sed -e "s#/lib/udev#${udev_helper_dir}#" -i "$@"
+}
+
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+
+ # patches go here...
+ epatch "${WORKDIR}/${PATCH}"
+ EPATCH_OPTS="-p1" epatch "${FILESDIR}/${PN}-114-root-link-2.diff"
+
+ epatch "${FILESDIR}/${P}-gentoo-rules-update.diff"
+
+ # Bug 195317
+ epatch "${FILESDIR}"/${P}-path-to-logger.diff
+
+ # add blacklisting option where needed
+ #sed -e '/MODALIAS/s#modprobe#modprobe --use-blacklist#' \
+ # -e '/while read id/s#modprobe#modprobe --use-blacklist#' \
+ # -i etc/udev/rules.d/80-drivers.rules
+
+ # 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} != 42ee128b936ebad2e80f011597c869b2 ]]
+ 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
+
+ # 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"
+
+ # make install does not install this
+ dosbin udevstart || die "Required binary not installed properly"
+ doman udevstart.8
+
+ exeinto "${udev_helper_dir}"
+ newexe "${FILESDIR}"/net-104-r10.sh net.sh || die "Required binary not installed properly"
+ newexe "${FILESDIR}"/move_tmp_persistent_rules-112-r1.sh move_tmp_persistent_rules.sh \
+ || die "Required binary 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
+ cat "${FILESDIR}"/udev.conf.115-r6 >> "${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-115-r6.sh udev-start.sh
+ newins "${FILESDIR}"/udev-stop-111-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}
+ dodoc docs/writing_udev_rules/*
+
+ 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
+
+ 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"
+}