diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-01-17 01:24:18 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-01-17 01:24:18 +0000 |
| commit | f4b128b5843770c9e216dcbfe366548d73b6c2fe (patch) | |
| tree | b77dad9c8eccf0448a48f7aa1751cd5fd1e5bc0d /sys-boot | |
| parent | old (diff) | |
| download | gentoo-2-f4b128b5843770c9e216dcbfe366548d73b6c2fe.tar.gz gentoo-2-f4b128b5843770c9e216dcbfe366548d73b6c2fe.tar.bz2 gentoo-2-f4b128b5843770c9e216dcbfe366548d73b6c2fe.zip | |
Detect genkernel initramfs files #300710 by Vincent-Xavier JUMEL.
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-1.96-genkernel.patch | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 4feb5fe94302..6ca9cd15bfdc 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.129 2010/01/10 06:13:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.130 2010/01/17 01:24:17 vapier Exp $ + + 17 Jan 2010; Mike Frysinger <vapier@gentoo.org> + files/grub-1.96-genkernel.patch: + Detect genkernel initramfs files #300710 by Vincent-Xavier JUMEL. 10 Jan 2010; Mike Frysinger <vapier@gentoo.org> grub-1.97.1.ebuild, grub-9999.ebuild: diff --git a/sys-boot/grub/files/grub-1.96-genkernel.patch b/sys-boot/grub/files/grub-1.96-genkernel.patch index 471fc66a99da..e06f38356a02 100644 --- a/sys-boot/grub/files/grub-1.96-genkernel.patch +++ b/sys-boot/grub/files/grub-1.96-genkernel.patch @@ -1,7 +1,7 @@ --- util/grub.d/10_linux.in +++ util/grub.d/10_linux.in -@@ -93,7 +93,7 @@ - echo "$a" +@@ -61,7 +61,7 @@ + EOF } -list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do @@ -9,3 +9,11 @@ if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi done` +@@ -78,6 +78,7 @@ + initrd= + for i in "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${version}" "initrd.img-${alt_version}" \ ++ "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \ + "initrd-${alt_version}.img" "initrd-${alt_version}"; do + if test -e "${dirname}/${i}" ; then + initrd="$i" |