Make a symlink from /boot/grub/grub.cfg to /boot/grub2/grub.cfg in case people don't read the warning.

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

4 files changed, 30 insertions, 11 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index fc8e05381bfe..1d6818489f6e 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.280 2013/09/21 18:44:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.281 2013/09/21 21:28:37 floppym Exp $
+
+  21 Sep 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00_p5107-r1.ebuild,
+  grub-9999.ebuild:
+  Make a symlink from /boot/grub/grub.cfg to /boot/grub2/grub.cfg in case people
+  don't read the warning.
 
   21 Sep 2013; Mike Gilbert <floppym@gentoo.org> grub-2.00_p5107-r1.ebuild,
   grub-9999.ebuild:
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6d18841a90a1..980ebc005f80 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -64,15 +64,15 @@ EBUILD grub-0.97-r9.ebuild 9053 SHA256 b6411eb5c379cc6b9120f1f727733d9724c425740
 EBUILD grub-0.97.ebuild 4238 SHA256 d93dd5dca80c822e0659007b827966fb69c7f702b13ba672b4c3f486af54cee1 SHA512 46d72cfaa5735d0b3d2d89a8e6ce83745e4645370cdbbfcffc37d1413ffeb2b1caafac8c7cc712925ffc09411870b06467eb50bc475997508e7beea8fa5172d7 WHIRLPOOL 4b6fe9a7300baf6364555858a49ae2775ea0da27291d5d48fa634097531ae3b6da445ee2f959ef584bf4c913aad5e689b77e7326af257549ef107704dc0d202e
 EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c59e739015dc949a51011f585 SHA512 520bd623cfaf70451b4331f2dc464982f4de1b0c070ee8c0b336c9d16589aaa96924ea923f4c47ccb07d3c8f6da987a89ed285f1f4fa8f922465ab912e8940bd WHIRLPOOL 5abb91bf54a5024b225e7c3891b884827b31e6e8e380db9aa37fd520c55cd2e94ce1e7545271d52a58baab63446906cb69440177a4678000ac519088b9ae6966
 EBUILD grub-2.00-r4.ebuild 6772 SHA256 567b9c19af55d0687a084eab551197c6bb2b36bc800375f6fc3522b611effb19 SHA512 0a09c35b7e534a772451eb3a3ef8a6333d89abc9b6e3cae4548e4e289fe8104e1282fe7e1ca699a5d2650fb83ae75f06ee732ec13b2d6e509c3311591e654427 WHIRLPOOL ab8e4b5566283f6f07b31022e646863f44b37a8d8bb210bc7db7843220b25cf235599fc458225792afabec5e449e3d72dd005ee75d904b8e62b857e6bf680253
-EBUILD grub-2.00_p5107-r1.ebuild 7045 SHA256 762ba486a0a0ecdfc1934597fb5e4cd42458892f6e1f0c0b6652de82900b05fd SHA512 38316d38d3028195c3162f488b2de25638d2063e0a238ef6d4c0e9b30cb1a597528a664a1ce1408cbb25bd74ca8ad5a5aa193cc732472c17116a96612cf21a0e WHIRLPOOL 29b727d562b2faa055ff64db77415cdfbe9ae7b49d4c2336094885f7a84fb3fbdb0f28f4624ce6ff890fcdf1ded57ae0303c98c8510c221f39925fcf4b590a28
+EBUILD grub-2.00_p5107-r1.ebuild 7267 SHA256 def363a7a9fc6042cc31b57db9bdc641ed69fd46f0aa5d9b2279e7bc3a1fc4e7 SHA512 a478211470f5f49098c334178ac247fceaddde2fe9cac850a44e5f01d0561bfd9143474950eee5419f4c8667274ca6a43191a5c9728d188900f2829365a836a1 WHIRLPOOL 92045a61d55f2cf8cfd59769057c4d89d833b0809dac030d9242e8528554610cc03c34e73b8f7c40f9521d257dc92efe4d546b1237a618ed597906db9b4e6cba
 EBUILD grub-2.00_p5107.ebuild 6567 SHA256 fecc66f9d1f45a940530ddaf1fc9fcb1c05c2346b1ee8170c3a897d7be5c5fd9 SHA512 7ce9b814878dceb204dbe5a7103517ab451bce414e2075420e234392369b5edd82e499907becdabff456ad3c5ca53ede74dfa7132ed1b33904f44c52fc471cd0 WHIRLPOOL 103d3db1fb21055d69289717bf6acef361cc4fec4e862413f90d047987889d8b248b5c15288977aab2f3df686990dd14f3e6a3cf90da0d3eb0a066f2b773a593
-EBUILD grub-9999.ebuild 7038 SHA256 d528f92e6b865a3c101adc6ce6177d42a596d931a0a48cfcf46272259ac4378c SHA512 2494c9d8f5a7bee32f8f54594bf36e806b9064c2514e751af782bc270268de105419a0e66ca772273d160a9068b0bd50304b8db698b41e2ce980e86589af5829 WHIRLPOOL c4d8720af1e134400c8e31d3555ca917f15f6d8e91b7cd253c944ada775e94e6b80bb8ea487788674e651fb0b893acae2600d6de757c03cd683f5ab3ccd24e91
-MISC ChangeLog 52989 SHA256 3adff5d5a6db29fa75b7ec78fd1ceedb15497f9504eaffb72e9504f47e69ce69 SHA512 61e964527497af20fdef0b18948e596e123f1560603090576c99ed1771b04dcdd154e1e47a8020f75199359094e8f06f34cb3f9bd698e2b28c0fdacc841eee48 WHIRLPOOL 1c6f54e73689b3c6434636d06aa0c3ae37c6a46b6730b4636959997bb77708f9a83aa9c076796e01f9ba36ab09adb187e16ff9870a7391638f9999678413103e
+EBUILD grub-9999.ebuild 7260 SHA256 bf6bb19733be5e128495052db975c39c030171c2b1626a5e27500b795855b53e SHA512 7a0cd3799aa858b8a070bebef455c4210780d616d33951d07cf636b2e68f1771744e11603355e283fc087c29e34911cefe165174ef94905a8ed78bc6698cb722 WHIRLPOOL 8039bac9e8c2b6889efa20657702760a3add6509f40a0f10dc574e200c154c880a284590149e94f0b8e3acc17c098cd877b7cfce0499dd97fc1878eff1463932
+MISC ChangeLog 53193 SHA256 11041b1bcd0ddd10d9cc6f8dc2f5c50cbee166f85289aa6fe628ba39c2bf6e83 SHA512 cf24f9f0dccb3390586ea672ef7a91fc08f2aad61d148aff8d5fb1eadffa97d7b2647983f332dfddd518d7ce20c0031da5d5841d53c3b1f013def89347f50512 WHIRLPOOL 3b36103f40e2527fc902b5b83cbda3156466a9431c44b757b709f12934296236a0dab5771f015da93e3f813dc6fe8bdf758f9747e2e80cb6cc4e20d74d95ce0b
 MISC metadata.xml 852 SHA256 d03182ca221633a5a479beec5bad1444859f2c586ad4d7764a9f531687cc73c0 SHA512 190483450afea0409f50f592e0290744cfc9e10362ec9c0c0d02b6f9933788bfc6b88a2e37a7e5a26066b914b6979a5dac6c6a2e7fa861dc5e728b34aec37e5b WHIRLPOOL 9c904cae80a6cbe7a7b35ef1d889478e79aac5006aa693af2884a7c21483f90f943322bf9206921db39db706cb36b5b509b420199269a385b47e75c8b2c2bb42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iF4EAREIAAYFAlI96SMACgkQC77qH+pIQ6Q9zgEAiR7cYyDVVu3zDvpbgULDWjMJ
-Mo82U5xZ6oF3lACt6y4A/23rc7OPoV7k0LCCNfhOqA4yxZfz3qLtjSFEd5Jo+911
-=EF92
+iF4EAREIAAYFAlI+D4cACgkQC77qH+pIQ6SY7gEAs/TIOBYGAsXSz+5m45vJQqCi
+/I5Jk1EYPUpQ0DRsJpABAJl8V9u2iSRcdBwN7QudqiQpNoJuFmIHlp03cMvgwXR/
+=Ud/O
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.00_p5107-r1.ebuild b/sys-boot/grub/grub-2.00_p5107-r1.ebuild
index 9601d9e97cbd..f965275fd06c 100644
--- a/sys-boot/grub/grub-2.00_p5107-r1.ebuild
+++ b/sys-boot/grub/grub-2.00_p5107-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-boot/grub/grub-2.00_p5107-r1.ebuild,v 1.5 2013/09/21 18:44:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_p5107-r1.ebuild,v 1.6 2013/09/21 21:28:37 floppym Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	AUTOTOOLS_AUTORECONF=1
 fi
 
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -249,6 +249,13 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+		mkdir -p "${ROOT%/}/boot/grub"
+		ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+	fi
+
+	mount-boot_pkg_postinst
+
 	elog "For information on how to configure GRUB2 please refer to the guide:"
 	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
 
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index c689ae773471..073c00b90e06 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-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-boot/grub/grub-9999.ebuild,v 1.105 2013/09/21 18:44:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.106 2013/09/21 21:28:37 floppym Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	AUTOTOOLS_AUTORECONF=1
 fi
 
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
 
 if [[ ${PV} != 9999 ]]; then
 	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -249,6 +249,13 @@ src_install() {
 }
 
 pkg_postinst() {
+	if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
+		mkdir -p "${ROOT%/}/boot/grub"
+		ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
+	fi
+
+	mount-boot_pkg_postinst
+
 	elog "For information on how to configure GRUB2 please refer to the guide:"
 	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"