Make sure boot is mounted rw before we go setting it up #348946 by Jaco Kroon.

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

7 files changed, 39 insertions, 21 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 2fdffeef8fc9..d45cc11bd9dc 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.148 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.149 2011/02/13 07:41:16 vapier Exp $
+
+  13 Feb 2011; Mike Frysinger <vapier@gentoo.org> grub-0.97-r8.ebuild,
+  grub-0.97-r9.ebuild, grub-0.97-r10.ebuild, grub-1.98.ebuild,
+  grub-9999.ebuild:
+  Make sure boot is mounted rw before we go setting it up #348946 by Jaco
+  Kroon.
 
   09 Jan 2011; Mike Frysinger <vapier@gentoo.org> grub-0.97-r8.ebuild,
   grub-0.97-r9.ebuild, grub-0.97-r10.ebuild, grub-1.98.ebuild,
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b0dd819d1984..29fb41e3ef27 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -28,23 +28,23 @@ EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a
 EBUILD grub-0.96-r1.ebuild 4747 RMD160 1fbaf2c1e712baf3cd7124b6e9ba58ba63ce631a SHA1 3e877e57f4a7618c7a3ebe374fa9f5ae39aae3f4 SHA256 a000bb83287a7d46a5637b60e477d8fedbf8c2b465074edf1ba3b21bca95a374
 EBUILD grub-0.96-r2.ebuild 4349 RMD160 8b59e7b7bcf02f6e6698bf785950988c71907e26 SHA1 5f068f5fcfd05a7769814d6fae868f77dea2ccf9 SHA256 cbaae5c519231d853e28e9a2799b08544e8b2a97c93d1905a21244d385b0e20c
 EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b SHA1 2d7dd82a379afd847be5b129a090bb1e954ffd71 SHA256 2278f36b971d091471f39acd68902edf5e54fc88bc2d417e033fbf8128159e13
-EBUILD grub-0.97-r10.ebuild 9406 RMD160 4857af2e7ef28d03cab82ed913a8ab9dbfd2c518 SHA1 275db398496e693fc9a828828b236a5be052d11d SHA256 6c49708cb612b0df0f932cdb82272633c9c16ae6da50ac8d7041d1c2147e823a
+EBUILD grub-0.97-r10.ebuild 9483 RMD160 53f72f5670b5b3833e8fa40ae92dc51b25c2d86b SHA1 84b964ca5433de35f7c3b1ed7243ee5b050667e4 SHA256 97b7c25d0c50cd1f2e4319fd3f9d7389e0dddce2254eb7994e49fa8475d88809
 EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
 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 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6 SHA1 ebf3222a1eaac1c272de84617a64e2e3da80a315 SHA256 c7fb9191776c0bacf6b9160f1e78cb1fa6ccefbed03b85a219a1ab355bc5f36b
-EBUILD grub-0.97-r8.ebuild 8896 RMD160 2678cd9c90f27c3e6118a32bb5084f4b168e708d SHA1 3331ee90ee1f86d435ba9ae8073b5a693a8787dd SHA256 a7e1f5e68dbb3155448cb58ae9fdb9b2df76d132499f1f1c21c7e00b473ff5bc
-EBUILD grub-0.97-r9.ebuild 9000 RMD160 ab74b7a274978cbb3ae88c631b717ec8b09ac9fe SHA1 3c35111eefbe3430533023e3b021d1e02c9362f5 SHA256 a9d934d82e78d9dd77dc938899704a59d02682a0cce9b333285f3230affc5b61
+EBUILD grub-0.97-r8.ebuild 8973 RMD160 5bb9c6e19ea7f80fc5bccbb1d1b70ce5369e9f70 SHA1 001e5f609d814d758a2950b1786194bfe2f9ecd2 SHA256 95e7eea47240d902de89bd20f8e5ca6bf5b5bc0433a10336f84cd80304e65164
+EBUILD grub-0.97-r9.ebuild 9077 RMD160 dd85bded8ff1f243949873e56aeca30aef51f194 SHA1 95324e4f094be9abd7f1266dc79fd6bb7a1352fd SHA256 580561ad14a72f313b6ca161d8f5f2d620b5f11f964174f64e90b195a7682660
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.98.ebuild 2992 RMD160 8d8a8bbdcf8793e6264b4493fc87bead577b10e6 SHA1 b46cf265f419201dd3c0e0221ef848b179e5c7bd SHA256 bf2b089aba96a59c0b7bee5261d0030f3c4212cc3d209fa227c300b8f97fb2de
-EBUILD grub-9999.ebuild 3074 RMD160 c34b32a0d3ef6f2f82dc0a730d9af38ed2023347 SHA1 3ff05f6b5bed4e154c63e201b3b2b80eee42a88e SHA256 f7662b66ba30bc68e2a2c56c6bd23bd80573d2e2a77eb9da0afd5ee98f3d987e
-MISC ChangeLog 30427 RMD160 2045ffe94212abec3b171bd44f2ee40201e63021 SHA1 807665b1ffec619a572f5f1f57bba4576750cdac SHA256 324134824548015d4717d62739ba8222299b49ed13abf135666044f2862b28c5
+EBUILD grub-1.98.ebuild 3070 RMD160 521713befc67c22b5718693d646e9cc95f3efe93 SHA1 7919195340c23eceabd3e0f686fb33d4788de61d SHA256 b3a1c3092eb9b377d4b3d1d0f5ba8186b986c86d6f84a68bc5cdca455ddac3d4
+EBUILD grub-9999.ebuild 3152 RMD160 f59276af6496876954c7528a5d59ac58208187ae SHA1 c9e1fc13b444a9842670a967e69151b869a2d7d8 SHA256 1f8b361376dfbd75b355c3f7a78db51bb67e6cfd405aa1df6e818c597ff6bb75
+MISC ChangeLog 30665 RMD160 7ffcd8f88e2ce0d2c760c91cd9d6bbea0e487c96 SHA1 bd3eaf31c9312f7ee1da01ffa3b304a8a59544ee SHA256 3b6c9c91675faa0a920b858a472dc9a89881b0e9245486b16c9f3649328fc96f
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0pKhMACgkQaC/OocHi7JbJaAD/QzKutfK05+smXD3RkvY6d+eJ
-qDhynBfStvkNKhCmkD4A/0QSxxzkAreqXceBitRgeD2AXxde5NwB9O0RqquX7UDn
-=o4dX
+iF4EAREIAAYFAk1XiyIACgkQaC/OocHi7JYd5wD/Rh13kt3JKGR2KA76puGajxcr
+7nG4+oFL3kUbAanVIH8A/0T5x6EQcoh662QGSpXf+ETKMTxEXFUj+EPcY+FlSxVk
+=0d1A
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index 84f2146321e1..8fbfdc2a77b6 100644
--- a/sys-boot/grub/grub-0.97-r10.ebuild
+++ b/sys-boot/grub/grub-0.97-r10.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-boot/grub/grub-0.97-r10.ebuild,v 1.8 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.9 2011/02/13 07:41:16 vapier 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
@@ -257,7 +257,7 @@ setup_boot_dir() {
 }
 
 pkg_postinst() {
-	mount-boot_pkg_postinst
+	mount-boot_mount_boot_partition
 
 	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
 		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
@@ -276,6 +276,8 @@ pkg_postinst() {
 	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
 	elog "grub where to install in a non-interactive way."
 
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
 }
 
 pkg_config() {
diff --git a/sys-boot/grub/grub-0.97-r8.ebuild b/sys-boot/grub/grub-0.97-r8.ebuild
index ac44cdb2fe89..89f6b9d92716 100644
--- a/sys-boot/grub/grub-0.97-r8.ebuild
+++ b/sys-boot/grub/grub-0.97-r8.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-boot/grub/grub-0.97-r8.ebuild,v 1.2 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r8.ebuild,v 1.3 2011/02/13 07:41:16 vapier 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
@@ -239,7 +239,7 @@ setup_boot_dir() {
 }
 
 pkg_postinst() {
-	mount-boot_pkg_postinst
+	mount-boot_mount_boot_partition
 
 	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
 		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
@@ -258,6 +258,8 @@ pkg_postinst() {
 	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
 	elog "grub where to install in a non-interactive way."
 
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
 }
 
 pkg_config() {
diff --git a/sys-boot/grub/grub-0.97-r9.ebuild b/sys-boot/grub/grub-0.97-r9.ebuild
index 3df7fc02611a..655cae3b9d88 100644
--- a/sys-boot/grub/grub-0.97-r9.ebuild
+++ b/sys-boot/grub/grub-0.97-r9.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-boot/grub/grub-0.97-r9.ebuild,v 1.6 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r9.ebuild,v 1.7 2011/02/13 07:41:16 vapier 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
@@ -246,7 +246,7 @@ setup_boot_dir() {
 }
 
 pkg_postinst() {
-	mount-boot_pkg_postinst
+	mount-boot_mount_boot_partition
 
 	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
 		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
@@ -265,6 +265,8 @@ pkg_postinst() {
 	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
 	elog "grub where to install in a non-interactive way."
 
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
 }
 
 pkg_config() {
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
index c67491625021..eabb00c4fde6 100644
--- a/sys-boot/grub/grub-1.98.ebuild
+++ b/sys-boot/grub/grub-1.98.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-boot/grub/grub-1.98.ebuild,v 1.6 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.7 2011/02/13 07:41:16 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -102,11 +102,14 @@ setup_boot_dir() {
 }
 
 pkg_postinst() {
-	mount-boot_pkg_postinst
+	mount-boot_mount_boot_partition
 
 	if use multislot ; then
 		elog "You have installed grub2 with USE=multislot, so to coexist"
 		elog "with grub1, the grub2 install binary is named grub2-install."
 	fi
 	setup_boot_dir "${ROOT}"boot
+
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
 }
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 622619ff6125..5a65e84cfe87 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-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-boot/grub/grub-9999.ebuild,v 1.27 2011/01/09 03:22:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.28 2011/02/13 07:41:16 vapier Exp $
 
 # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
 
@@ -102,11 +102,14 @@ setup_boot_dir() {
 }
 
 pkg_postinst() {
-	mount-boot_pkg_postinst
+	mount-boot_mount_boot_partition
 
 	if use multislot ; then
 		elog "You have installed grub2 with USE=multislot, so to coexist"
 		elog "with grub1, the grub2 install binary is named grub2-install."
 	fi
 	setup_boot_dir "${ROOT}"boot
+
+	# needs to be after we call setup_boot_dir
+	mount-boot_pkg_postinst
 }