Another tweak for the fstab check.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 39 insertions, 33 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index e07ef25c5863..b1b9c83b2a4d 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.795 2013/01/21 20:20:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.796 2013/01/21 20:41:00 floppym Exp $
+
+  21 Jan 2013; Mike Gilbert <floppym@gentoo.org> udev-197-r3.ebuild,
+  udev-197-r4.ebuild, udev-9999.ebuild:
+  Another tweak for the fstab check.
 
   21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> udev-197-r3.ebuild,
   udev-197-r4.ebuild, udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 253a54e9fe6f..c7bf00a0140f 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,20 +11,16 @@ DIST udev-197-patches-1.tar.bz2 1344 SHA256 563479e8860ba6d67366f40d9e58b85e31f9
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD udev-171-r10.ebuild 16106 SHA256 c9e107c27107cfe9c9e3cba319d7280b4510f0b466222354f45c6c8664b48371 SHA512 79a62ae8e519a7cf2e0e78f5d87d7d046ef14ea0571bf20e51b1121927e40b67069291ed050610541422c47535c1d85b6f2f3001078fe2f73d89878fdd3782a3 WHIRLPOOL 770759c3c24ed66d0ebda92517a096f91f4d644af276116f21c4acb9625644e33f9441927fe75167786df2e6400635622670e7a5cb6056f5311222537982f065
-EBUILD udev-197-r3.ebuild 13355 SHA256 a6d3d2854d0c99f563d9d5a4a54084a2d24a8c2dcb3f64eb3a350c278ec9c56b SHA512 09345f9d812e5a1de8cb858997686e6f1da7cb6981c89b6953634cafb527b3e0559da14ccd5e18aba42b69a2be2ac5ea82e5ccc6903da60479fde35483cd6627 WHIRLPOOL 146b21de9e97a224e3a151f11f422ec340cc8eb284eb821698d6c798937f74c338a8530267348f6c72eaaa79fa4366721d081eed8225e663c8b34623629c0469
-EBUILD udev-197-r4.ebuild 13483 SHA256 5f7c11746d8956ee5b0faa177da4b0b07d85928bbd85d21a96656135a9cc3cb2 SHA512 f73b74eadd3b65ccfa3f366da870fd8c217bfd394d1502ba449ff1c7d3811c8cc4f45d1e6c8724e7e73ceccff98b19df7dc42bebcf5e2d03724c8f9a3c05437b WHIRLPOOL eb10ca75569c81bb4b12f4485c005b3cb5e4d0046d3e2f2226ea9c04637030dcaad2ab418932a5f43362510688d681d69c1b43c7cd5ca0d574d3b3e6e0af11c7
-EBUILD udev-9999.ebuild 13481 SHA256 02001adea9906ef084525c2f191a8ad79c767e2d80d537f9597e024b08361160 SHA512 d11a40129098984b1a3f74ff0d28951fe64160256bbf853456d008c09d4e86f760bfefdb6718138c9ad55066f2f569083a05defa90de11f37977ed5e7b39eefd WHIRLPOOL e8b69a47c6201ddd7962ea86ab4d050eb27353f29e54336f1e01dd93e8055cb9d68210243d145c10a27fbf506131fecb86fff89ad8e6068bf326f7496dc9c65f
-MISC ChangeLog 52031 SHA256 6c533e46342ae38d40aa505ce2478cf0e0246fcf85ca279cd4fc9e5ee299e2e0 SHA512 c91bfbf47def862c23e64dcde5a685a83d80231c3338ab955097487c6360e8ac66a96403cf69c431cc427c4bdcdedde56d056e22b81bb679a5481fe7daeac4bf WHIRLPOOL 2e8496d02fa007ab7aeb38901e7c64a506d4a88df7fbbf01e295ed958ab112fefc34251730c6d6f869e08fb64e4c9a792106d9e85c7249e48acedcff55cf546a
+EBUILD udev-197-r3.ebuild 13423 SHA256 814f0f1d069b8d2325679c3627ca835f568f36f4c0719780ac9e5b0709fc7c79 SHA512 d6bf7f158e9e98265641d7c45bc99b8bcfda17946c67afe4283a4a67af4608ca506728d7389887bdaa536830f3956b0dfcde679c96d3a16700c77a0cb1710659 WHIRLPOOL 38fa9a4a812d972460d1b4213128ab6f349762d5f977e31d2834587e8e85630fd808e140e75f5fe3c05065fde1adb78454ab870fea221c6e63e4af6722a63af6
+EBUILD udev-197-r4.ebuild 13551 SHA256 4f53de7276eb461a2a67918772f94d4ec52cc0197c98e0b3df4727f0f570bd3d SHA512 9006c1c348d8239e5297d24612cdda7df77c92132711bab3da1d1a52fd4597cdf65d3a3ecbf4ccc645ef9a5159b7c75b3af094c4e3f342425b63cda21bdd9294 WHIRLPOOL 5300ebc6e9e5519bc2e4d82ca81a112433f7a96b56ad9fddd57d6a63f186633ceca81b71a660ec6e3811aee7f65b994c6bc65e020e8ec4728e0f7a7bec314b09
+EBUILD udev-9999.ebuild 13549 SHA256 dcca0e86d212f24dddb7218eae00e834b81be61548df0e06cbd33d2a98d96069 SHA512 dffd6c8485d50b09f8cca78dc632c50af0d5be44158ebc37daf92a622197d332612f883be756049f83674db3e10decfd98ec16f32dfee81f446dab3d7747e269 WHIRLPOOL 53b39dbd36eeac5d9b02d2b75f270faa342713f0269fdbda2caf910845d66de1468818330d5c1213c916723457cfebc72d02c5224ca07549230bc6451033826f
+MISC ChangeLog 52176 SHA256 2c96ead97e3eaa5f4d4f5f721c83fa95647a753dc5c59dc0a1e172939aac56c0 SHA512 891ffbd07b402c816399bad9cc62eb18e16bfb6e2f52f45ff43d7fa854b10a414f3b64d0f722b9123e10c98db15b6df84edfe34ebc577588b8e42fb52f1d6eec WHIRLPOOL 3c4b8235de8c9f2ff0d54317be2f180dc9f953e2e3175ab2a195b1bce47e168a26837a882fdc1cdba36afd7e943af0cfc6d0e312a12797bcec87d5dca53cb23b
 MISC ChangeLog-2009 105929 SHA256 7a8d7123b7395dc5bbde09a8c0cee1c5110d24faf87a68a8210b0c6bdf862c1c SHA512 3b577c97224e7f85ae5fb0a0ead538f8aa83c738e6014fadaf5247f34d3863df4bc10f9d15a5e117813d081a8af1913ea41a5e60d00ed521ea0c1e5b71a91a2b WHIRLPOOL c9f527ba19e787f9973a26ed535dbf7af760c3a519f4b062cf2a8069e134a803ebe669450deace804be70619995b389529febf03e8aeb7183c3ea984c0dfdaa5
 MISC metadata.xml 1098 SHA256 69d8c28e0c2439c252068ae2e0141a9bad7b05e65b9dec27aa2dd3feb4f2393c SHA512 87354f467c3f2ed005a10652a2f80ffda010fbc0c6fb88436b906c92f4cf1543ed1a6cf4a49c93f15c6fea3ba0dcd108e1e120954f7b0860e7ac90072d2b3d67 WHIRLPOOL 9c01df67041d2093e5a2ee4a9ad65df613cdcb163bc366c8592e8e2be84b176da13198261a012687188918c906291d765856665806efe03b8dfb22a5b4eb6834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/aNJAAoJEEdUh39IaPFN+kcH/RBW/p/kdliqGtYUN+qbzcZR
-VGmk1lqBameSiwqJMkgn6ilDDDv02E+ePx4ndsF47Dr/K6DBERP2LvDZJl6SJMey
-zVeBlxx9Ipvih8mqCRKAFdBNFq8stX1MdJvVimXc5nO/tM7xl1JaDkxJUHqrh+z4
-o0gF1+1pXGkhU5Bgg/D2NnR/JceSlQNIASqAK5aSv8YD7RAt3MfukZ3aIJs7juIi
-aN7FwEiO/QBHrWWIsRxSNnuPzGDjSeYYl8vbQbU50hGIpKtYJRynG1nXyxxHa+zf
-gKQ7kft9d+v9xchAFox7ncqTTCme76cvVicNNP45RYZcXJSihkyN1Zh98Cf3kNM=
-=U+xh
+iF4EAREIAAYFAlD9p98ACgkQC77qH+pIQ6QO0AEAnszwuAoCc/DqtdTvVZ//oRSP
+8BT2q/biD1V3vALgE8wA+QHaT0gU6zPlDdVnNz6xyqMcJcWoSzd1wP1u823ygnz+
+=UmGK
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-197-r3.ebuild b/sys-fs/udev/udev-197-r3.ebuild
index 878bc60dfb23..d4b2e9061bfe 100644
--- a/sys-fs/udev/udev-197-r3.ebuild
+++ b/sys-fs/udev/udev-197-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.23 2013/01/21 20:21:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r3.ebuild,v 1.24 2013/01/21 20:41:00 floppym Exp $
 
 EAPI=4
 
@@ -449,12 +449,14 @@ pkg_postinst()
 			ewarn "information on this feature."
 	fi
 
-	local fstab="${ROOT}"etc/fstab
-	if grep -qs "\/dev" "${fstab}" && ! grep -qs devtmpfs "${fstab}"; then
-		ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-		ewarn "filesystem. Otherwise udev won't be able to boot."
-		ewarn "See, http://bugs.gentoo.org/453186"
-	fi
+	local fstab="${ROOT}"etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, http://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
 
 	if [[ -d ${ROOT}usr/lib/udev ]]
 	then
diff --git a/sys-fs/udev/udev-197-r4.ebuild b/sys-fs/udev/udev-197-r4.ebuild
index ce399d95d746..2bfd3dd1558b 100644
--- a/sys-fs/udev/udev-197-r4.ebuild
+++ b/sys-fs/udev/udev-197-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.12 2013/01/21 20:21:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-197-r4.ebuild,v 1.13 2013/01/21 20:41:00 floppym Exp $
 
 EAPI=4
 
@@ -456,12 +456,14 @@ pkg_postinst()
 			ewarn "information on this feature."
 	fi
 
-	local fstab="${ROOT}"etc/fstab
-	if grep -qs "\/dev" "${fstab}" && ! grep -qs devtmpfs "${fstab}"; then
-		ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-		ewarn "filesystem. Otherwise udev won't be able to boot."
-		ewarn "See, http://bugs.gentoo.org/453186"
-	fi
+	local fstab="${ROOT}"etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, http://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
 
 	if [[ -d ${ROOT}usr/lib/udev ]]
 	then
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 05b29d602cc3..0e99e6f7cbbb 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.154 2013/01/21 20:21:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.155 2013/01/21 20:41:00 floppym Exp $
 
 EAPI=4
 
@@ -456,12 +456,14 @@ pkg_postinst()
 			ewarn "information on this feature."
 	fi
 
-	local fstab="${ROOT}"etc/fstab
-	if grep -qs "\/dev" "${fstab}" && ! grep -qs devtmpfs "${fstab}"; then
-		ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-		ewarn "filesystem. Otherwise udev won't be able to boot."
-		ewarn "See, http://bugs.gentoo.org/453186"
-	fi
+	local fstab="${ROOT}"etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, http://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
 
 	if [[ -d ${ROOT}usr/lib/udev ]]
 	then