Only check for devtmpfs when installing into / #469620 by Roy Bamford.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 35 insertions, 31 deletions

diff --git a/sys-fs/static-dev/ChangeLog b/sys-fs/static-dev/ChangeLog
index bb361ec1976e..793fd353169e 100644
--- a/sys-fs/static-dev/ChangeLog
+++ b/sys-fs/static-dev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/static-dev
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/ChangeLog,v 1.14 2013/04/27 09:51:05 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/ChangeLog,v 1.15 2014/11/17 02:19:23 vapier Exp $
+
+  17 Nov 2014; Mike Frysinger <vapier@gentoo.org> static-dev-0.1.ebuild:
+  Only check for devtmpfs when installing into / #469620 by Roy Bamford.
 
   27 Apr 2013; Mike Frysinger <vapier@gentoo.org> static-dev-0.1.ebuild:
   Check for devtmpfs too #454404 by Alexander Tsoy.
diff --git a/sys-fs/static-dev/Manifest b/sys-fs/static-dev/Manifest
index 897534c6fe54..b7b08d0aed6b 100644
--- a/sys-fs/static-dev/Manifest
+++ b/sys-fs/static-dev/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD static-dev-0.1.ebuild 1151 SHA256 a192ccf696eee11a7a5faef6658d2acfe2ff830b5d29473392d9c455322427b3 SHA512 4ddc30d9b313e533cf3581be5f76813da383a4369d5ad1269f4b66c25571a27227417e5230fd99d97434f0064148b55071dae7bf480a03485d6ccb8878623171 WHIRLPOOL 35d01a22903346d24dcc8f2d3fd92dca9bea0b86986e69946f9d358e8a75ed450b2abf1c1704b14c997069f2405468aaa49645f8bd8470346d66d1cbb0fa3134
-MISC ChangeLog 1960 SHA256 fbc10037f95920635064690ec34e2198bc4a96969b54eb226dabc03340ed8d4c SHA512 2cc8ef5c64d5a4066ecf203172128a5d0f35b2e5bda4a344eea3a3eaad89f41099096c63b94bf54728db925aed7c040ae774c02364ee8dce6221732bff32ed16 WHIRLPOOL edd08df3d0d15d2248dd0b507c2699616d085e951f35df849a1fa662ed2d5bf02497d1604a36f5a63c76af1ea88a5597e16b26603d7a4b656631842449ab0ea6
+EBUILD static-dev-0.1.ebuild 978 SHA256 25656d8329028b53e2bd605191a252a891b7415f3a5afb963dc8554700a076b5 SHA512 25c28709e5e62fbfcffb2d421c58073a1926865c7e11bdbd8fe976de95b3bf6c14d7c20a066065ed3f61cfdb5c6d25d23910e7fd398e2d7283e5bf53dce0a34c WHIRLPOOL d52856811f6610ee15f93e8af4528812af41e32e9b206a4ba3d9dc0d1d2e98673caa1648043cc81a367b605895b34de36e7936c3dc3040f1ca5883b94acdb937
+MISC ChangeLog 2107 SHA256 b5b150a21d42d5ebe38dccca0755c862fe6affbc98d4e8520bf635ee391e9ca0 SHA512 8a88f9d214ce85ce9179bef3a20f7d55387319a192c775ed8a0165bdc518d224e2812811cab5c556b7a6a6a2ab73ba1fc2fdbffc78788fdd6756ed4aa4320eca WHIRLPOOL 503961c4b6018288c4dd849b49e5e06805a8229f876ab46560670bc964e3e20b504c02929285016e72f3b15f76d4a20902206c106b3f97c4f99742a1430054f2
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJRe5+LAAoJELEHsLL7fEFWh4oP/RNyUHU0Q65ullMhPM+MaCB2
-5sjmctrFfmEvnCH4C4Q19yN+0dyAdL2/wWk64sGpvgKuuTKJUkdNnWqaSKXfMJov
-ely2d92Q55swmQrTEYMNb5QnB9NQQnHI4muTw8guZHpTAqhx4+2BIk2NwkO3sG9D
-CEkrj82+UCcKPp1h0+/J7pMPpUaXC6eXmS51RHE1w8mB+QF72dgJP/El5KRo5Q8E
-bhPcpDhcGARsnhFBeehiJ9Aa9IPtxkn9VCXgJ00AI3a7kObmhEr/ozBGrZGlO1J6
-6LB+0CBT0qT5f/AWeNvGiT7C7at89PbQm20OQCSs0d4G8njfdddRG6APuQUPBXWB
-SJW3JhmlPMhPUe9YRJY2GtrtmbGZH3am6Z/FB3sIxspfDWb1LP3k8bYXC6A7a182
-nebm1KcU3qae2+m9KnPtiLHRJZtlQIqgmme5bgTvBVTKFSdxwshXKuW5k02Xhlbi
-SF1pPNVW/73icgb5Hwok7oiRDguCq2vhOY26ArXHVr5qj5DP5unmptQYDILM9q79
-d/Po/9BU7cEQyur5j+pUCDcqdJ90ER3fqnO1RGOjXnFeGv8byYQgPH2MGhzSM/vo
-MEwLMsul2ulMfGuYFmyYEp9f4ShEECBM4Q1tKZtFFlYLN1w3keOH4tspLfmAE+p0
-mB3F8kQbM9tRotZZFJ2H
-=Biqp
+iQIcBAEBCAAGBQJUaVstAAoJEPGu1DbS6WIATuUP/3njjwy1tdl1DapluHhR2heS
+ASO++PbJDXmJ81HJr+gONgV4Y7EGRKouJaxJnNfyKSVJaFxLiBpxoEJq+3zLPl1W
+r7A714elAHqy1Vccp8Juo/ibL5T2I/hhlAg3LeTSad6n085Mz8fRGNZfjfH1e62w
+R7vkQlyySoAjZtWTBxbRDxF4VNOeX6ADT3mVRpSOYpOcuD2h+tBpZhEEX+2f0L7w
+Ui8Jb3Xl/DYb6XNkX29s3dJ6SmkH4H97teejIcB8IAIpqydjHwIehtk29/lZ2PMz
+BZ9Ni10geCMfpy5Of+x7ncrjAeggbLAXC88uH0GSeUMuH/fIbKKCgjI3eRvgb7/J
+wHULcWiBBaRCvMOa/isr5vURQb6eGkXPT8+HXfuRPvM3z+Ev/G2EBsYm1Pcd/Wg6
+OoDJLzOXLJyP+m1Dykwi+TITUJi1jCEGc9DKWk3c7nn7VbixHh/l6RdmoZEiVsyo
+zoVARpHvK3ISusFBG1ba3skNPFD2fLzMsNMFBePLazbeVm47LE0GjvVZJMvI4kB5
+86tP9i43MDlB8JFNPQS1qcVqRqeuMOpTfLwVK3Zdm+T9h5+uWVolE0+M1M3juGoU
+J5E8S+1wnl0/M/mAOzYsk6rVfgpbzg0uEuaoabBTqYY5hPHiBVqZ5pMXkdH/HxRy
+Ro3T86V0C7sr7bmHheET
+=sn6f
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/static-dev/static-dev-0.1.ebuild b/sys-fs/static-dev/static-dev-0.1.ebuild
index cdb846bd517e..99543b99808d 100644
--- a/sys-fs/static-dev/static-dev-0.1.ebuild
+++ b/sys-fs/static-dev/static-dev-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.15 2013/04/27 09:51:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/static-dev/static-dev-0.1.ebuild,v 1.16 2014/11/17 02:19:23 vapier Exp $
 
 DESCRIPTION="A skeleton, statically managed /dev"
 HOMEPAGE="http://bugs.gentoo.org/107875"
@@ -13,19 +13,20 @@ IUSE=""
 
 RDEPEND="sys-apps/makedev"
 
+abort() {
+	echo
+	eerror "We have detected that you currently use udev or devfs or devtmpfs"
+	eerror "and this ebuild cannot install to the same mount-point."
+	die "Cannot install on udev/devfs tmpfs."
+}
+
 pkg_preinst() {
-	if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] || \
+	if [[ -d ${ROOT}/dev/.udev || -c ${ROOT}/dev/.devfs ]] ; then
+		abort
+	fi
+	if [[ ${ROOT} == "/" ]] && \
 	   ! awk '$2 == "/dev" && $3 == "devtmpfs" { exit 1 }' /proc/mounts ; then
-		echo ""
-		eerror "We have detected that you currently use udev or devfs or devtmpfs"
-		eerror "and this ebuild cannot install to the same mount-point."
-		eerror "Please reinstall the ebuild (as root) like follows:"
-		eerror ""
-		eerror "mkdir /tmp/newroot"
-		eerror "mount -o bind / /tmp/newroot"
-		eerror "ROOT=/tmp/newroot/ emerge sys-fs/static-dev"
-		eerror "umount /tmp/newroot"
-		die "Cannot install on udev/devfs tmpfs."
+		abort
 	fi
 }