/[gentoo-x86]/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
Gentoo

Contents of /sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (hide annotations) (download)
Sat Apr 7 21:33:13 2012 UTC (3 years, 2 months ago) by floppym
Branch: MAIN
Add patch to support genkernel initramfs in 10_linux.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

1 floppym 1.1 === modified file 'util/grub.d/10_linux.in'
2     --- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000
3     +++ util/grub.d/10_linux.in 2012-04-07 21:24:06 +0000
4     @@ -135,7 +135,7 @@
5     message="$(gettext_printf "Loading Linux %s ..." ${version})"
6     sed "s/^/$submenu_indentation/" << EOF
7     echo '$message'
8     - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
9     + linux ${rel_dirname}/${basename} ${rootcmd}=${linux_root_device_thisversion} ro ${args}
10     EOF
11     if test -n "${initrd}" ; then
12     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
13     @@ -181,19 +181,31 @@
14     alt_version=`echo $version | sed -e "s,\.old$,,g"`
15     linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
16    
17     + rootcmd=root
18     initrd=
19     + pushd "${dirname}" > /dev/null
20     for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
21     "initrd-${version}" "initramfs-${version}.img" \
22     "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
23     - "initrd-${alt_version}" "initramfs-${alt_version}.img" \
24     - "initramfs-genkernel-${version}" \
25     - "initramfs-genkernel-${alt_version}"; do
26     - if test -e "${dirname}/${i}" ; then
27     + "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
28     + if test -e "${i}" ; then
29     initrd="$i"
30     break
31     fi
32     done
33    
34     + if [ "x$initrd" = x ]; then
35     + for i in "initramfs-genkernel"*"-${version}" \
36     + "initramfs-genkernel"*"-${alt_version}"; do
37     + if test -e "${i}"; then
38     + initrd="$i"
39     + rootcmd=real_root
40     + break
41     + fi
42     + done
43     + fi
44     + popd > /dev/null
45     +
46     config=
47     for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
48     if test -e "${i}" ; then

  ViewVC Help
Powered by ViewVC 1.1.20