summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-11-10 10:31:10 +0000
committerMike Frysinger <vapier@gentoo.org>2010-11-10 10:31:10 +0000
commit37f390c7c0257934ae71bcddb3d798c25a38c4b0 (patch)
tree0a14c305261cf89364c5165dab836bafaa46614f /sys-boot/grub
parentFix digest (bug #344815 by Isidoro Garcia) properly. (diff)
downloadgentoo-2-37f390c7c0257934ae71bcddb3d798c25a38c4b0.tar.gz
gentoo-2-37f390c7c0257934ae71bcddb3d798c25a38c4b0.tar.bz2
gentoo-2-37f390c7c0257934ae71bcddb3d798c25a38c4b0.zip
update patch by Jiří Moravec to apply to latest bzr tree #343293 by Jeff Kowalczyk
(Portage version: 2.2_rc96/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
-rw-r--r--sys-boot/grub/files/grub-1.99-genkernel.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys-boot/grub/files/grub-1.99-genkernel.patch b/sys-boot/grub/files/grub-1.99-genkernel.patch
index 4947f8cec2d5..4d4aee5a0e9e 100644
--- a/sys-boot/grub/files/grub-1.99-genkernel.patch
+++ b/sys-boot/grub/files/grub-1.99-genkernel.patch
@@ -1,15 +1,15 @@
--- util/grub.d/10_linux.in
+++ util/grub.d/10_linux.in
-@@ -102,7 +102,7 @@
+@@ -109,7 +109,7 @@
EOF
}
--list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
-+list=`for i in /boot/kernel-* /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
+-list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
++list=`for i in /boot/kernel-* /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done`
prepare_boot_cache=
-@@ -120,6 +120,7 @@
+@@ -127,6 +127,7 @@
initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" \
"initrd-${version}" "initramfs-${version}.img" \