diff options
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 5c6f2733327c..98ac4519c482 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # 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.91 2008/05/06 14:23:28 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.92 2008/05/10 09:00:56 vapier Exp $ + + 10 May 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild: + Restore menu.lst symlink #220737 / #221055. 06 May 2008; Christian Faulhammer <opfer@gentoo.org> grub-0.97-r5.ebuild: stable x86, bug 220069 diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index 4cd24fc5524d..86e502b1662e 100644 --- a/sys-boot/grub/grub-0.97-r5.ebuild +++ b/sys-boot/grub/grub-0.97-r5.ebuild @@ -1,6 +1,11 @@ # 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-r5.ebuild,v 1.11 2008/05/06 14:23:28 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.12 2008/05/10 09:00:56 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 +# we never updated any of the source code (it still all wants menu.lst), +# and there is no indication that upstream is making the transition. inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -164,6 +169,11 @@ setup_boot_dir() { ewarn fi + if [[ ! -e ${dir}/menu.lst ]]; then + einfo "Linking from new grub.conf name to menu.lst" + ln -snf grub.conf "${dir}"/menu.lst + fi + if [[ -e ${dir}/stage2 ]] ; then mv "${dir}"/stage2{,.old} ewarn "*** IMPORTANT NOTE: you must run grub and install" |