add warning about separate /usr partition.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux i686

4 files changed, 57 insertions, 9 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index fb5a48129b26..d36326342dd2 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.614 2011/11/09 04:44:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.615 2011/11/09 22:53:09 williamh Exp $
+
+  09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
+  udev-9999.ebuild:
+  add warning about separate /usr partition.
 
   09 Nov 2011; William Hubbs <williamh@gentoo.org> udev-175.ebuild,
   udev-9999.ebuild:
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 38246c454cb8..e91933fb0159 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -130,14 +130,14 @@ EBUILD udev-151-r4.ebuild 16852 RMD160 e0d2c7041c102e0e5979a1ed5c99d9f4d5820842
 EBUILD udev-164-r2.ebuild 15294 RMD160 2d7299b463cb765a58ec0840c4c86607fbf37e64 SHA1 cb4060adb3235d261f027be37e56272ac8f4755b SHA256 3f1b289c9c9c2d6ee6cd63b8db530240dcc9532dbc3ff273c052679b3062724b
 EBUILD udev-171-r1.ebuild 15984 RMD160 2f687585ae93014dbeaaa61e440e0f708ecd2b04 SHA1 92b4eee4956b24677d9e8251b29c40c300cf059c SHA256 9cf4a54cc9e34bf48c5299142a625d056869fbabcd683a233053e6fd04305218
 EBUILD udev-171-r2.ebuild 16413 RMD160 4b7e26ba462c959329d60488aa7f76efb0986297 SHA1 866171a1074b32653aafbd77bb2516c0b444a202 SHA256 3ee60a02912e42a16663be50adec46ec5ee8f26f10eb88609378e7272a05c376
-EBUILD udev-175.ebuild 11835 RMD160 e0d737629947bd9504097be27811a13184b54fe5 SHA1 7f86a46543bc707d280406c43be1a67d0abdcd42 SHA256 fb0ee4213ab94aff03c108318f8974aa2a59796ef399639613f8f78f648157c6
-EBUILD udev-9999.ebuild 11839 RMD160 5949ab65994829324abc66e5e2aa99bd03d2e9d0 SHA1 91f94eb6593038e0d2d64343a3731a452346aeeb SHA256 16e86f4ec5f471ae8d3a0186645df875cb30ef1065c44331e4187e0f249c4da6
-MISC ChangeLog 125609 RMD160 895837e3edb894290ebebbff11987bbf5e0c593b SHA1 2da4b99b61e98d328c8f1483545d09b75948b322 SHA256 bafd831b283e8f5fb8ebf879abbbe87049df99aef7d180c773cefe3c05d2336d
+EBUILD udev-175.ebuild 12518 RMD160 4977168127075bb9fe19d0a433ae484c83ad43a2 SHA1 9f38ec94829b0b8c9aa67f1d151feb61e1e88096 SHA256 0a057795be225e843c1385af14a9b7f548bc0b4fbda1e12e4854094d66630bae
+EBUILD udev-9999.ebuild 12522 RMD160 761eb9e918a308c843054825814599701ca30c27 SHA1 efefc60ced40e4be285f226e861358f71e149d88 SHA256 2c146942ed93e7931c8a400a16689e5295519b068708e0b0031c443e7f9aada9
+MISC ChangeLog 125743 RMD160 d1d56c6bfb8499443f5450acc8994bd1be7b9559 SHA1 2baf8db50e58ca6dd30b1e5b09c07029e7b1f211 SHA256 ff965ff0235507101a9c4031c295272eebb8fb191adcd248eb49bce83e5b8846
 MISC metadata.xml 1235 RMD160 36ff4665ed99aa392ff8003e9351bd620cc79424 SHA1 3fd0e915598c248b5c7d609b6a98a4cde8431b05 SHA256 dbbbd093a910a5cb541d7be160f749dc87fc699d72165c184965fa056d60f24b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk66BS4ACgkQblQW9DDEZTgdPgCeIbXt5x5vXlTZRLKh/8HlRcrU
-B/QAoL1R/wZ+Aq/KILy06Yow+cYzSrVU
-=1WuQ
+iEYEARECAAYFAk67BGMACgkQblQW9DDEZThKnQCeKtFkdR8LIxm5FSOca6sKsUT9
+PfcAoKPDA2VrhsXFuYrPoKqyq49YqjQU
+=Hwaq
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-175.ebuild b/sys-fs/udev/udev-175.ebuild
index e79b899715db..f1eeaf100aff 100644
--- a/sys-fs/udev/udev-175.ebuild
+++ b/sys-fs/udev/udev-175.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175.ebuild,v 1.4 2011/11/09 04:44:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-175.ebuild,v 1.5 2011/11/09 22:53:09 williamh Exp $
 
 EAPI=4
 
@@ -348,6 +348,16 @@ postinst_init_scripts()
 	fi
 }
 
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${EROOT}"/proc/mounts
+    return 1
+}
+
 pkg_postinst()
 {
 	fix_old_persistent_net_rules
@@ -430,6 +440,18 @@ pkg_postinst()
 	ewarn "action_modeswitch has been removed by upstream."
 	ewarn "Please use sys-apps/usb_modeswitch."
 
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 031fe181a791..1c6415cbf721 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.60 2011/11/09 04:44:15 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-9999.ebuild,v 1.61 2011/11/09 22:53:09 williamh Exp $
 
 EAPI=4
 
@@ -348,6 +348,16 @@ postinst_init_scripts()
 	fi
 }
 
+# This function determines if a directory is a mount point.
+# It was lifted from dracut.
+ismounted()
+{
+	while read a m a; do
+		[ "$m" = "$1" ] && return 0
+	done < "${EROOT}"/proc/mounts
+    return 1
+}
+
 pkg_postinst()
 {
 	fix_old_persistent_net_rules
@@ -430,6 +440,18 @@ pkg_postinst()
 	ewarn "action_modeswitch has been removed by upstream."
 	ewarn "Please use sys-apps/usb_modeswitch."
 
+	if ismounted /usr
+	then
+		ewarn
+		ewarn "Your system has /usr on a separate partition. This means"
+		ewarn "you will need to use an initramfs to pre-mount /usr before"
+		ewarn "udev runs."
+		ewarn "This must be set up before your next reboot, or you may"
+		ewarn "experience failures which are very difficult to troubleshoot."
+		ewarn "For a more detailed explanation, see the following URL:"
+		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
+	fi
+
 	elog
 	elog "For more information on udev on Gentoo, writing udev rules, and"
 	elog "         fixing known issues visit:"