]> TLD Linux GIT Repositories - packages/grub2.git/blob - choose-preferred-initrd.patch
- grub2 from PLD
[packages/grub2.git] / choose-preferred-initrd.patch
1 --- grub-2.00/util/grub-mkconfig.in~    2013-04-15 00:03:09.162253769 +0200
2 +++ grub-2.00/util/grub-mkconfig.in     2013-04-15 01:39:22.112705322 +0200
3 @@ -233,7 +233,8 @@
4    GRUB_SAVEDEFAULT \
5    GRUB_ENABLE_CRYPTODISK \
6    GRUB_BADRAM \
7 -  GRUB_DISABLE_SUBMENU
8 +  GRUB_DISABLE_SUBMENU \
9 +  GRUB_PREFER_DRACUT
10  
11  if test "x${grub_cfg}" != "x"; then
12    rm -f "${grub_cfg}.new"
13 --- grub-2.00/util/grub.d/10_linux.in~  2013-04-15 00:03:09.162253769 +0200
14 +++ grub-2.00/util/grub.d/10_linux.in   2013-04-15 01:38:26.992181771 +0200
15 @@ -191,10 +191,12 @@
16    linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
17  
18    initrd=
19 -  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
20 -          "initrd-${version}" "initramfs-${version}.img" \
21 -          "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
22 -          "initrd-${alt_version}" "initramfs-${alt_version}.img" \
23 +  if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
24 +         initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version} initramfs-${version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
25 +  else
26 +         initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version}  initramfs-${alt_version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
27 +  fi
28 +  for i in $initrd_search_list \
29            "initramfs-genkernel-${version}" \
30            "initramfs-genkernel-${alt_version}" \
31            "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
32 --- grub-2.00/util/grub.d/20_linux_xen.in~      2013-04-15 11:47:30.852286811 +0200
33 +++ grub-2.00/util/grub.d/20_linux_xen.in       2013-04-15 11:49:05.606550816 +0200
34 @@ -212,10 +212,12 @@
35         linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
36  
37         initrd=
38 -       for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
39 -          "initrd-${version}" "initramfs-${version}.img" \
40 -          "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
41 -          "initrd-${alt_version}" "initramfs-${alt_version}.img" \
42 +       if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
43 +           initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version} initramfs-${version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
44 +       else
45 +           initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${version}.gz initrd-${version}  initramfs-${alt_version}.img initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
46 +       fi
47 +       for i in $initrd_search_list \
48            "initramfs-genkernel-${version}" \
49            "initramfs-genkernel-${alt_version}" \
50            "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \