diff options
author | Mike Gilbert <floppym@gentoo.org> | 2013-09-21 21:28:37 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2013-09-21 21:28:37 +0000 |
commit | 183ee0fc4e4073829b90e25260c2dd14d9b9b6d2 (patch) | |
tree | b01dae7154c0c55f66da575ebfb7428196a20e57 | |
parent | Fix installation. (diff) | |
download | gentoo-2-183ee0fc4e4073829b90e25260c2dd14d9b9b6d2.tar.gz gentoo-2-183ee0fc4e4073829b90e25260c2dd14d9b9b6d2.tar.bz2 gentoo-2-183ee0fc4e4073829b90e25260c2dd14d9b9b6d2.zip |
Make a symlink from /boot/grub/grub.cfg to /boot/grub2/grub.cfg in case people don't read the warning.
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
-rw-r--r-- | sys-boot/grub/ChangeLog | 7 | ||||
-rw-r--r-- | sys-boot/grub/grub-2.00_p5107-r1.ebuild | 11 | ||||
-rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 11 |
3 files changed, 24 insertions, 5 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/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" |