From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 28 Jan 2007 23:14:11 +0000 (+0000)
Subject: Only screw with udevd when ROOT == /.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=066672c8ff8a8cd3786c45778b5e5b236105fcf1;p=gentoo.git

Only screw with udevd when ROOT == /.
Package-Manager: portage-2.1.2-r4
---

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 105335495a0d..744cda850c94 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # 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.233 2007/01/27 12:27:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.234 2007/01/28 23:14:11 vapier Exp $
+
+  28 Jan 2007; Mike Frysinger <vapier@gentoo.org> udev-103.ebuild,
+  udev-104-r3.ebuild, udev-104-r4.ebuild:
+  Only screw with udevd when ROOT == /.
 
 *udev-104-r4 (27 Jan 2007)
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 85915f0b1e80..e620520c482b 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -255,22 +255,22 @@ EBUILD udev-100.ebuild 10915 RMD160 c5fc2619945e23b21fa68341b58768f0333028ca SHA
 MD5 79d593777de6d3da93f90f1b61293cc0 udev-100.ebuild 10915
 RMD160 c5fc2619945e23b21fa68341b58768f0333028ca udev-100.ebuild 10915
 SHA256 081675002a6de866a57e8a89706e3a4d17da0e19957b4a3fd509fe1bed5d1a69 udev-100.ebuild 10915
-EBUILD udev-103.ebuild 11303 RMD160 4e15d036f5f87f88b4f87f5bbb79ff0d91eb5a21 SHA1 453001970c8ba2675a9dff8b401a77885fa929a2 SHA256 9c88cec683f3f46921579eb9ff79ad26e26c30c946c6d66c4cdddfb6e25c0fdd
-MD5 75fabfd452ae34fc7c5ab383d2b77f73 udev-103.ebuild 11303
-RMD160 4e15d036f5f87f88b4f87f5bbb79ff0d91eb5a21 udev-103.ebuild 11303
-SHA256 9c88cec683f3f46921579eb9ff79ad26e26c30c946c6d66c4cdddfb6e25c0fdd udev-103.ebuild 11303
-EBUILD udev-104-r3.ebuild 9057 RMD160 3a55933e3f25376fdcd53f9000b0d9ea0582fb91 SHA1 587c71436b852a868c9c67ed1b3a0b8b5be99b16 SHA256 66ac1764bed0793e30a181c3ea1727d92b620e51919f489757c650121bcfc186
-MD5 bb6f5c01606c5291557739178dd00026 udev-104-r3.ebuild 9057
-RMD160 3a55933e3f25376fdcd53f9000b0d9ea0582fb91 udev-104-r3.ebuild 9057
-SHA256 66ac1764bed0793e30a181c3ea1727d92b620e51919f489757c650121bcfc186 udev-104-r3.ebuild 9057
-EBUILD udev-104-r4.ebuild 9057 RMD160 1178c68068ba46224c83248aa9263ee5ebc2f63d SHA1 aa56d223dc98f9009d878bfa10b9b6ad818c9147 SHA256 e2bcbbdd07545caf1759d485e8bcc3898b1771264ab12a2a055a9a2985441590
-MD5 e360e984aa7d13783178b19b1ca8afe4 udev-104-r4.ebuild 9057
-RMD160 1178c68068ba46224c83248aa9263ee5ebc2f63d udev-104-r4.ebuild 9057
-SHA256 e2bcbbdd07545caf1759d485e8bcc3898b1771264ab12a2a055a9a2985441590 udev-104-r4.ebuild 9057
-MISC ChangeLog 43495 RMD160 7f49f09f60e0151abd9908f82c4518373c7a2e54 SHA1 35d1a7ac4f2702c8866a0ba36d1d7ec705e46128 SHA256 b4e969966c294e260a552c08ca8169dea54498939939e0e8ac4515d230f0bba4
-MD5 2211cccc9518175484c85499b1c4bd2a ChangeLog 43495
-RMD160 7f49f09f60e0151abd9908f82c4518373c7a2e54 ChangeLog 43495
-SHA256 b4e969966c294e260a552c08ca8169dea54498939939e0e8ac4515d230f0bba4 ChangeLog 43495
+EBUILD udev-103.ebuild 11330 RMD160 2cd175754a4ca6f5e9f585d1558337f801838f6e SHA1 2356cbde5afe3d64f8244696f1d54cf924aa412d SHA256 791e5c5ef52eacb0c2b85b67221ced66f1b9fafcf1758c46ab92ee73ca86d529
+MD5 1d8eb946427b3797d10ade1e1a6a0324 udev-103.ebuild 11330
+RMD160 2cd175754a4ca6f5e9f585d1558337f801838f6e udev-103.ebuild 11330
+SHA256 791e5c5ef52eacb0c2b85b67221ced66f1b9fafcf1758c46ab92ee73ca86d529 udev-103.ebuild 11330
+EBUILD udev-104-r3.ebuild 9084 RMD160 2ba4e947b56c33b4c624ac9771be69a02b177bab SHA1 1950e6957b4dc537be70f48c425300751709198b SHA256 b83ddf5cbfea210a10e4094ac1f3a3ea245badf8b1a9d4b158ebe3b0ca2567d0
+MD5 0285d98533840e58b8fe6290750106f7 udev-104-r3.ebuild 9084
+RMD160 2ba4e947b56c33b4c624ac9771be69a02b177bab udev-104-r3.ebuild 9084
+SHA256 b83ddf5cbfea210a10e4094ac1f3a3ea245badf8b1a9d4b158ebe3b0ca2567d0 udev-104-r3.ebuild 9084
+EBUILD udev-104-r4.ebuild 9084 RMD160 20452cd5ec7bc743eeeecaec198f103c5cacef08 SHA1 d7e67bb8affc94f5c5d139beb4a3fcb69a1f9f08 SHA256 11d714cca5ff9508f5a45794a7f8487f75a7d177d1ab4b458cca4f6d9b3b6db6
+MD5 a9f082ccb826d1e2d1d78e76d8a7c47b udev-104-r4.ebuild 9084
+RMD160 20452cd5ec7bc743eeeecaec198f103c5cacef08 udev-104-r4.ebuild 9084
+SHA256 11d714cca5ff9508f5a45794a7f8487f75a7d177d1ab4b458cca4f6d9b3b6db6 udev-104-r4.ebuild 9084
+MISC ChangeLog 43647 RMD160 1432328a00cb2f1f8f009771c828d3787388a7f9 SHA1 630990d4808ac8774bf0e2adf5625020f7eb56d9 SHA256 3a819b8273a5273e9a05a03b30f6ddd5461ee60498ded45a455e7b50019d2055
+MD5 5a63e86969b84161b908a430d5adcdec ChangeLog 43647
+RMD160 1432328a00cb2f1f8f009771c828d3787388a7f9 ChangeLog 43647
+SHA256 3a819b8273a5273e9a05a03b30f6ddd5461ee60498ded45a455e7b50019d2055 ChangeLog 43647
 MISC metadata.xml 447 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be SHA1 70c43d2863c09958849bfce8c5bb97d406a0662b SHA256 a9881de1424ac71191111bd30c7c1253589673b0cdce13c352204f1499e9d884
 MD5 f74bee0505505c00e76da6313db29e49 metadata.xml 447
 RMD160 d1ba09bd6a434b25c718673de9258cc544e090be metadata.xml 447
@@ -320,7 +320,7 @@ SHA256 36aae1151cda7c7f51bfb8204b7cef8301f80ea336086802f1a8c495a7eb7749 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFu0VAt2vP6XvVdOcRAq+TAJ9WxwTiXsaTmDxSoHbih9PsqElYiACfcFMz
-50r3Ovusz6w6jy9BfMQQcGo=
-=m9qU
+iD4DBQFFvS588bi6rjpTunYRApzYAJij1QCClQQeeU8ziNcgSYFtITiLAJ4yGeCK
+yR/n586licLZgBVVrPSvrA==
+=wqPZ
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-103.ebuild b/sys-fs/udev/udev-103.ebuild
index c5971c7d4902..bf6a5e136e17 100644
--- a/sys-fs/udev/udev-103.ebuild
+++ b/sys-fs/udev/udev-103.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.8 2007/01/26 13:59:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-103.ebuild,v 1.9 2007/01/28 23:14:11 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -256,13 +256,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
-	then
-		killall -15 udevd &>/dev/null
-		sleep 1
-		killall -9 udevd &>/dev/null
+	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
-	/sbin/udevd --daemon
 
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...
diff --git a/sys-fs/udev/udev-104-r3.ebuild b/sys-fs/udev/udev-104-r3.ebuild
index 361b3aed525b..49eefb22800a 100644
--- a/sys-fs/udev/udev-104-r3.ebuild
+++ b/sys-fs/udev/udev-104-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r3.ebuild,v 1.3 2007/01/27 11:26:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r3.ebuild,v 1.4 2007/01/28 23:14:11 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -231,13 +231,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
-	then
-		killall -15 udevd &>/dev/null
-		sleep 1
-		killall -9 udevd &>/dev/null
+	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
-	/sbin/udevd --daemon
 
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...
diff --git a/sys-fs/udev/udev-104-r4.ebuild b/sys-fs/udev/udev-104-r4.ebuild
index 30d769557bc6..c94a1b013e82 100644
--- a/sys-fs/udev/udev-104-r4.ebuild
+++ b/sys-fs/udev/udev-104-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.1 2007/01/27 12:27:35 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-104-r4.ebuild,v 1.2 2007/01/28 23:14:11 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -231,13 +231,14 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT}" = "/" -a -n "`pidof udevd`" ]
-	then
-		killall -15 udevd &>/dev/null
-		sleep 1
-		killall -9 udevd &>/dev/null
+	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
-	/sbin/udevd --daemon
 
 	# people want reminders, I'll give them reminders.  Odds are they will
 	# just ignore them anyway...