| 1 |
vapier 08/05/10 09:00:57 |
| 2 |
|
| 3 |
Modified: ChangeLog grub-0.97-r5.ebuild |
| 4 |
Log: |
| 5 |
Restore menu.lst symlink #220737 / #221055. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.92 sys-boot/grub/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.92&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.92&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.91&r2=1.92 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 18 |
retrieving revision 1.91 |
| 19 |
retrieving revision 1.92 |
| 20 |
diff -u -r1.91 -r1.92 |
| 21 |
--- ChangeLog 6 May 2008 14:23:28 -0000 1.91 |
| 22 |
+++ ChangeLog 10 May 2008 09:00:56 -0000 1.92 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for sys-boot/grub |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.91 2008/05/06 14:23:28 opfer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.92 2008/05/10 09:00:56 vapier Exp $ |
| 28 |
+ |
| 29 |
+ 10 May 2008; Mike Frysinger <vapier@g.o> grub-0.97-r5.ebuild: |
| 30 |
+ Restore menu.lst symlink #220737 / #221055. |
| 31 |
|
| 32 |
06 May 2008; Christian Faulhammer <opfer@g.o> grub-0.97-r5.ebuild: |
| 33 |
stable x86, bug 220069 |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.12 sys-boot/grub/grub-0.97-r5.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?rev=1.12&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?rev=1.12&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?r1=1.11&r2=1.12 |
| 42 |
|
| 43 |
Index: grub-0.97-r5.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v |
| 46 |
retrieving revision 1.11 |
| 47 |
retrieving revision 1.12 |
| 48 |
diff -u -r1.11 -r1.12 |
| 49 |
--- grub-0.97-r5.ebuild 6 May 2008 14:23:28 -0000 1.11 |
| 50 |
+++ grub-0.97-r5.ebuild 10 May 2008 09:00:56 -0000 1.12 |
| 51 |
@@ -1,6 +1,11 @@ |
| 52 |
# Copyright 1999-2008 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.11 2008/05/06 14:23:28 opfer Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.12 2008/05/10 09:00:56 vapier Exp $ |
| 56 |
+ |
| 57 |
+# XXX: we need to review menu.lst vs grub.conf handling. We've been converting |
| 58 |
+# all systems to grub.conf (and symlinking menu.lst to grub.conf), but |
| 59 |
+# we never updated any of the source code (it still all wants menu.lst), |
| 60 |
+# and there is no indication that upstream is making the transition. |
| 61 |
|
| 62 |
inherit mount-boot eutils flag-o-matic toolchain-funcs autotools |
| 63 |
|
| 64 |
@@ -164,6 +169,11 @@ |
| 65 |
ewarn |
| 66 |
fi |
| 67 |
|
| 68 |
+ if [[ ! -e ${dir}/menu.lst ]]; then |
| 69 |
+ einfo "Linking from new grub.conf name to menu.lst" |
| 70 |
+ ln -snf grub.conf "${dir}"/menu.lst |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
if [[ -e ${dir}/stage2 ]] ; then |
| 74 |
mv "${dir}"/stage2{,.old} |
| 75 |
ewarn "*** IMPORTANT NOTE: you must run grub and install" |
| 76 |
|
| 77 |
|
| 78 |
|
| 79 |
-- |
| 80 |
gentoo-commits@l.g.o mailing list |
Archives