Only print warning about udev-postmount if it's present in runlevels boot, default or sysinit wrt #453408 by Pacho Ramos

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

5 files changed, 36 insertions, 20 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index ad9c2d51bf56..c7d574cfba7a 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.31 2013/01/21 19:55:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.32 2013/01/21 21:15:51 ssuominen Exp $
+
+  21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  udev-init-scripts-19-r1.ebuild, udev-init-scripts-21.ebuild,
+  udev-init-scripts-9999.ebuild:
+  Only print warning about udev-postmount if it's present in runlevels boot,
+  default or sysinit wrt #453408 by Pacho Ramos
 
 *udev-init-scripts-21 (21 Jan 2013)
 
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index b947975e0f29..5ef6e02396b6 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -4,15 +4,19 @@ Hash: SHA256
 AUX udev-init-scripts-19-start-only-regular-file.patch 249 SHA256 367a3fd5282bca9846b515165d40ea072ea0390248f080832b650d6439d68f5e SHA512 aa10ba463e3aee6eb878eb13de5ea35b34f98996d35437999b333a8e717dc9e03b6fedeadd2a84815e64f5ffbeded53a849b838e8a700a14b86f7ef8b9e2bb32 WHIRLPOOL f1246fbee309968d6a25f5f11b3aad33120c369ef4c0367c47fd0c596b7b72e0340848c087616bab3a9d826f0ee88799269c510cb075f823b7a5404094970cda
 DIST udev-init-scripts-19.tar.bz2 4792 SHA256 6917206ed2804c044352061c6acb1ca9a86df4a963735660df8e2dce86037916 SHA512 79a3e94b3bf4fc3af4e3bad48fdf6a0124c94efb4ddc346eae360cef8b73040d433d27f55c0d480b6e7ded661b7d899e443213a7083ff6e4758e0125186876dc WHIRLPOOL 48bec0466226e3455213e5f70f0a48ae18ab3ace6606050ccfa0c30ceb422361334fc6056278454c9908e99839f99e8dcce75b2c7ba414616758760f98aa577b
 DIST udev-init-scripts-21.tar.bz2 4852 SHA256 fde1c4e7568442cca5d070d02b6efb5be323b947033ab019ab0c574a1c1ced62 SHA512 f2f8ab69a3bf5b873d5c55061aec141316dd6df4f07f175fcc0b79a14b79c4f826051e89c9b0f936492b7d87ab5373ac7366a4807403a0512ed39641da813218 WHIRLPOOL 083511b4e13f9272d8f57d9bceec76f86bee8996da1f6ea748a6c2c973dce13634eabb1802a6d220557cef4e6c946194ac94f664167bb274b5d8fc701e7c6db7
-EBUILD udev-init-scripts-19-r1.ebuild 2236 SHA256 2394ae9861904f63bdef1bdb8bcb09f25cb23d9c66d3815ac0165b8b6948f061 SHA512 6db68a20d9065412f9094b87a42c0649f83a9fd88fa14dd8ff1d9af572df497494a716e3ce4c3e09bf8055a761a49f7df5c44c0bd05070d36f1957c813f44ff9 WHIRLPOOL a2fae70e75e6348c90c966bd221b1891ca91be4a114555e3fe3b5fd44338791a87c7ef74af31edfc9d136a671ef7fe828a8d0c13a14b40f6fe47e46d9a065e78
-EBUILD udev-init-scripts-21.ebuild 2190 SHA256 40c7154b4583fcfa849ec98cf059dc52bb9f03fca7dc16e5b4e5f2f52c482030 SHA512 5a04a2b129fcdbee6c913906acc4faf3ab885bee00e9d5b43cce38d54ed9d009b1f34a7e9ebac53ce168e5c8e353d4894d0fa2255107c512ed132cb21e4b998e WHIRLPOOL 465788fcec3f57a792669cd540410d05f059dea3f441ce92474b0d0f6f9b525de1c5e747606c231f59cb4f31d33829f0a2b8f20256b0da4a828e8debd2243773
-EBUILD udev-init-scripts-9999.ebuild 2193 SHA256 e450ae44df1241937bd50f2f08b95db70a6da5f57cf890ae5795db8b25aa0a57 SHA512 27925d7915f5d3e1fab46953e329195045bc5f92acbbecc91691e590827f14633ed9a0e89083611a9500e27dbbe3036baa920af643f24570fef724759f96b8ea WHIRLPOOL ca5abca7f4a014e7d3de6d07368bf3097548e989e2bcac5f07c073cb2e0b11c746c095f656848985f3cf4c48d2b862664f1b42b9cc074042c3f83b7d452ed0e1
-MISC ChangeLog 5682 SHA256 618a4bec22cb61cfc8ee487d246bfd8e7cc0660f38a2ed3053792a8033fb3cec SHA512 fae2a513f41be6c7a7f54d40057387d048b5c103fad4d7942b1f766b3954d5746a09daf68027be702a60dd669571c6c68fa484688d87a7e482d77206b0862557 WHIRLPOOL dd59a8d6aa20f4fa13020856cf8c9f52f0344fd07b90d30171e054674996b8060fdfa9186bb1300203823b7fcf8c8de4c8a775d05a5b4469f44647033f6f0f86
+EBUILD udev-init-scripts-19-r1.ebuild 2361 SHA256 1b8b67e0e7f263cbfcf8572e7451cf461ff185ca0c89f7b3ac1ae97030db5423 SHA512 331b68c0830ca189b89152f32d415d48eb10eec8b443f9a505f7f9981c8bedc9f764e0ea318a930000f1dc9b68dabddad7b52209f529604a9d1a58f7bed313fe WHIRLPOOL 3432de29c01e9fe5adfc597b38bfa7df11511c9e9a0a4c81c40635b1f74a7db8bf23972046df4d4bc0f83c4e1bc8a36038589ce5b91ec1ffb64e26185b636b23
+EBUILD udev-init-scripts-21.ebuild 2316 SHA256 548e514381da1fbcfead4ede328f2f68fedc70f7fd75378dfdb4b3e2c7e84229 SHA512 b6b4f6ded4cfea2f91ef29c46da7c52288fb0be093f3a516fe3e19dcd40912b4a08605e329660dbecb397a3dedd1652202d78c04996d4099858e7b12af34d977 WHIRLPOOL 1a1999b9e574a89856d67b8a6c8711d94a5495878b6f1d9ea5c700fa31d76888d1ae83e78ace856c6cbee2f9893346416b53c112d7d4ab303b05c1512a607d33
+EBUILD udev-init-scripts-9999.ebuild 2319 SHA256 f2da945be1eb677bf007ca307f6209704b8983b2b9380e2db2b2d7720b96dc76 SHA512 cc467e2edfb901297cf2c92874e73b2deb0f13e297d5da79293a0a9f77cf2c10af6f3bec5c183d6948ff4874e6008b3093d8a1381ffba41e87e2938d53b32976 WHIRLPOOL df1d533ab5d32a6cf99bc53b5207fbfd980e1cc4c3cd60c65145264b896f4a648569ccdd2d3f7dadb617505e112aab8f307acdf747f9c4a2ee816d752b178395
+MISC ChangeLog 5959 SHA256 f3c642c84d7a5625d2e9b9abd4d9c1c5a7cd6f80b0881a7e6ffe6126afdf167a SHA512 3fe6a68144b01304a2445e64995abe25f0939298cf49eb3713e7b7102e28234ddf39b1c365443222dd82ebd8915f65491213c285aa23fafb7fa4c8ca4878eaee WHIRLPOOL 8acc03313118a0c64de02bd867992706e062a4902cda2b68a3a7ca7cc31e6764dc42be7a20a7a3216438e7d956cdda469fb52da6d93be4594265512ec46eb8a0
 MISC metadata.xml 206 SHA256 e8bae0ea2f16b0ad92858b68718c01ab85b5e6995a35b88c74e4ad9772b9f813 SHA512 f6558663be8014488111639a4eeadc9e691f57f2eb4f3c97d6022a50ab2659fac2df458cefed5e29a6661d59221b15332aefa00c027552a8f4bbefc3988e2a90 WHIRLPOOL b515e201c4f614326c4ee0ef0e13fd9d277e913d96265ecce11b41c9628fa38d1e34f90fab1073527e153a9e2e8929c5fee748a8e5eaf98b58fe15928c8ad457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD9nTAACgkQblQW9DDEZThvugCeN0Pm005c9Hb8P92P4yEloqzw
-m/4AoL1YdSOY8eRihNB1B+GEjghNG4ZV
-=rd2H
+iQEcBAEBCAAGBQJQ/bAHAAoJEEdUh39IaPFNbQkIAIzmU+y6UoPXsfQ7QlOqJ2rP
+MGatXhCYtMov1QkbdBJUcrvMtDtiB4NbAdMiduk/eIcKyRB3UyfiAu3kQ8aZQSGI
+Cq+wLS0FzVqyPdVAY73WdGS1fLgn+42uZZ8p1ScDLXIC/WcQPRfSJbJUAqLokWgC
+x/GG/+okGAu1JuLzlsqxxqrqEQga9oXfIdBwfuVVpim1VJQUnwv+iDPkOsVPebUh
+n9rwk6vYCXLNhg+mQ53RF2RAqLDMqpZrCzbxA+YV1Or8Z/qInJy/hD964aeoXWLG
+x0lxnj/TdXDWk9VR574n9eHxNg4R5rZvcEfpslATtsxJCyhJnQ4A09PJUQevDJ8=
+=rxkK
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild
index 3fe51a57c4f2..6a2ac6e72abd 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.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-init-scripts/udev-init-scripts-19-r1.ebuild,v 1.1 2013/01/21 10:23:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-19-r1.ebuild,v 1.2 2013/01/21 21:15:51 ssuominen Exp $
 
 EAPI=4
 
@@ -77,7 +77,9 @@ pkg_postinst()
 		fi
 	fi
 
-	ewarn "The udev-postmount service has been removed because the reasons for"
-	ewarn "its existance have been removed upstream."
-	ewarn "Please remove it from your runlevels."
+	if [[ -x $(type -P rc-config) ]] && rc-config --list | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
 }
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-21.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-21.ebuild
index 3db7403b2576..5f615311e371 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-21.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-21.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-init-scripts/udev-init-scripts-21.ebuild,v 1.1 2013/01/21 19:55:27 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-21.ebuild,v 1.2 2013/01/21 21:15:51 ssuominen Exp $
 
 EAPI=4
 
@@ -77,7 +77,9 @@ pkg_postinst()
 		fi
 	fi
 
-	ewarn "The udev-postmount service has been removed because the reasons for"
-	ewarn "its existance have been removed upstream."
-	ewarn "Please remove it from your runlevels."
+	if [[ -x $(type -P rc-config) ]] && rc-config --list | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
 }
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 5ce65ef73bd7..9200f78295d7 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-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-init-scripts/udev-init-scripts-9999.ebuild,v 1.14 2013/01/21 17:53:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.15 2013/01/21 21:15:51 ssuominen Exp $
 
 EAPI=4
 
@@ -77,7 +77,9 @@ pkg_postinst()
 		fi
 	fi
 
-	ewarn "The udev-postmount service has been removed because the reasons for"
-	ewarn "its existance have been removed upstream."
-	ewarn "Please remove it from your runlevels."
+	if [[ -x $(type -P rc-config) ]] && rc-config --list | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
 }