Update the pkg_postinst message again, so that anybody with DONT_MOUNT_BOOT gets reminded to run emerge --config as well, so everything is in sync.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 4c9d7c181c5e..35a17f774e55 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.98 2008/07/06 22:55:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.99 2008/07/07 08:48:08 robbat2 Exp $
+
+  07 Jul 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r6.ebuild:
+  Update the pkg_postinst message again, so that anybody with
+  DONT_MOUNT_BOOT gets reminded to run emerge --config as well, so
+  everything is in sync.
 
   06 Jul 2008; Christian Faulhammer <opfer@gentoo.org> grub-0.97-r6.ebuild:
   stable x86, bug 230836
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 22ee847748d4..071e2bfb1d61 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
@@ -28,15 +25,8 @@ EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b
 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
 EBUILD grub-0.97-r5.ebuild 6880 RMD160 942a63d78c6c1f58f7139b5df863c89466484828 SHA1 e684dfe0429d53776e1c6518c1a29f1340eccd5f SHA256 bc7d6d3c392f69d21115adefbb34ddbab2b56fdcfad3063518ae95aff82ab1b1
-EBUILD grub-0.97-r6.ebuild 7913 RMD160 44abe6000254fc1347ce88b1ee385b790b3f8bb7 SHA1 cebe2d5b42829dba178dc64667db186b04b83b17 SHA256 e4df75bd52b91abeb61e8e2e0516feb4c1035ccfcdc32a6738b6a1c1d2eab0cf
+EBUILD grub-0.97-r6.ebuild 8386 RMD160 1863e7d2c07230df854aecfcc1f5f076031dc548 SHA1 7eb9847c9ac220a7ba64aa999a4406b94b737e82 SHA256 46ffcbbec7406c93fbaa72d5ea3ca657189fba340bd9cd156a7a985947059e23
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.96.ebuild 955 RMD160 0065ef0437d4f9f5bc8014402e4c598b66fe6961 SHA1 c6ce24be9fd6b5bbd2ce598820f3410f5aaf2a70 SHA256 9d6049ecf33d1d877f8c1bf8b938d91a7c09c005a5a1fd8b5d7018fe70172a39
-MISC ChangeLog 22721 RMD160 83ae3a0d5d9e5dd1015ca8172138b7f5e1fbb71a SHA1 b2d57cdde5de68fdbdeadf4c570c4a29d48e3942 SHA256 c6dbab99feb4b8814e299b2e932d4ef1704f682ad76b4447253668c18f818255
+MISC ChangeLog 22952 RMD160 3a0c7b5f42426e78daa16a6a304127bf316f95f8 SHA1 396eac916655d29ee8c2914b65581ecf1f12fd91 SHA256 870103aa09d402ec567e7e637236ea20276f3280b315f74504b96f1b4a56f42e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhxTXYACgkQNQqtfCuFneM1XwCgkq6Psn0MY4T4bXEcLCb892hB
-WycAn21FoNrq68VXBdrMZ3/5aHfc59SQ
-=j4+/
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r6.ebuild b/sys-boot/grub/grub-0.97-r6.ebuild
index dad6421ca3e3..84521e0fbe97 100644
--- a/sys-boot/grub/grub-0.97-r6.ebuild
+++ b/sys-boot/grub/grub-0.97-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.7 2008/07/06 22:55:44 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r6.ebuild,v 1.8 2008/07/07 08:48:08 robbat2 Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -221,13 +221,25 @@ setup_boot_dir() {
 	if [[ ! -e ${dir}/default ]] ; then
 		grub-set-default --root-directory="${boot_dir}" default
 	fi
+	einfo "Grub has been installed to ${boot_dir} successfully."
 }
 
 pkg_postinst() {
-	[[ -n ${DONT_MOUNT_BOOT} ]] || setup_boot_dir "${ROOT}"/boot
-	elog "To install grub files to another device (like a usb stick), just run:"
+	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
+		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
+		elog "the following instructions for your /boot!"
+		elog "Neglecting to do so may cause your system to fail to boot!"
+		elog
+	else
+		setup_boot_dir "${ROOT}"/boot
+		# Trailing output because if this is run from pkg_postinst, it gets mixed into
+		# the other output.
+		einfo ""
+	fi
+	elog "To interactively install grub files to another device such as a USB"
+	elog "stick, just run the following and specify the directory as prompted:"
 	elog "   emerge --config =${PF}"
-	elog "Alternately, you can use GRUB_ALT_INSTALLDIR=/path/to/use to tell"
+	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
 	elog "grub where to install in a non-interactive way."
 
 }