choose-preferred-initrd.patch

   1 diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00.git20131218/util/grub-mkconfig.in
   2 --- grub-2.00.git20131218.orig/util/grub-mkconfig.in    2013-12-18 14:44:31.000000000 +0100
   3 +++ grub-2.00.git20131218/util/grub-mkconfig.in 2013-12-18 14:45:37.000000000 +0100
   4 @@ -255,7 +255,8 @@
   5    GRUB_ENABLE_CRYPTODISK \
   6    GRUB_BADRAM \
   7    GRUB_OS_PROBER_SKIP_LIST \
   8 -  GRUB_DISABLE_SUBMENU
   9 +  GRUB_DISABLE_SUBMENU \
  10 +  GRUB_PREFER_DRACUT
  11
  12  if test "x${grub_cfg}" != "x"; then
  13    rm -f "${grub_cfg}.new"
  14 --- grub-2.12/util/grub.d/10_linux.in.orig      2023-12-20 18:29:16.010179150 +0100
  15 +++ grub-2.12/util/grub.d/10_linux.in   2023-12-20 18:38:21.914140889 +0100
  16 @@ -223,12 +223,12 @@
  17    done
  18
  19    initrd_real=
  20 -  for i in "initrd.img-${version}" "initrd-${version}.img" \
  21 -          "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
  22 -          "initrd-${alt_version}.gz.old" "initrd-${version}" \
  23 -          "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
  24 -          "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
  25 -          "initrd-${alt_version}" "initramfs-${alt_version}.img" \
  26 +  if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
  27 +         initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
  28 +  else
  29 +         initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${alt_version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
  30 +  fi
  31 +  for i in $initrd_search_list \
  32            "initramfs-genkernel-${version}" \
  33            "initramfs-genkernel-${alt_version}" \
  34            "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
  35 --- grub-2.12/util/grub.d/20_linux_xen.in.orig  2023-12-20 18:43:31.667835423 +0100
  36 +++ grub-2.12/util/grub.d/20_linux_xen.in       2023-12-20 18:45:35.230741185 +0100
  37 @@ -295,12 +295,12 @@
  38         linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
  39
  40         initrd_real=
  41 -       for i in "initrd.img-${version}" "initrd-${version}.img" \
  42 -          "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
  43 -          "initrd-${alt_version}.gz.old" "initrd-${version}" \
  44 -          "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
  45 -          "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
  46 -          "initrd-${alt_version}" "initramfs-${alt_version}.img" \
  47 +       if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
  48 +           initrd_search_list="initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version} initramfs-${alt_version}.img"
  49 +       else
  50 +           initrd_search_list="initramfs-${version}.img initrd.img-${version} initrd-${version}.img initrd-${alt_version}.img.old initrd-${version}.gz initrd-${alt_version}.gz.old initrd-${version} initramfs-${alt_version}.img initramfs-${alt_version}.img.old initrd.img-${alt_version} initrd-${alt_version}.img initrd-${alt_version}"
  51 +       fi
  52 +       for i in $initrd_search_list \
  53            "initramfs-genkernel-${version}" \
  54            "initramfs-genkernel-${alt_version}" \
  55            "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \