- dracut is only option now, no point to search for old initrds

[packages/grub2.git] / choose-preferred-initrd.patch

diff --git a/choose-preferred-initrd.patch b/choose-preferred-initrd.patch
deleted file mode 100644 (file)
index b6f1887..0000000
--- a/choose-preferred-initrd.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub-mkconfig.in grub-2.00.git20131218/util/grub-mkconfig.in
---- grub-2.00.git20131218.orig/util/grub-mkconfig.in   2013-12-18 14:44:31.000000000 +0100
-+++ grub-2.00.git20131218/util/grub-mkconfig.in        2013-12-18 14:45:37.000000000 +0100
-@@ -255,7 +255,8 @@
-   GRUB_ENABLE_CRYPTODISK \
-   GRUB_BADRAM \
-   GRUB_OS_PROBER_SKIP_LIST \
--  GRUB_DISABLE_SUBMENU
-+  GRUB_DISABLE_SUBMENU \
-+  GRUB_PREFER_DRACUT
- 
- if test "x${grub_cfg}" != "x"; then
-   rm -f "${grub_cfg}.new"
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.00.git20131218/util/grub.d/10_linux.in
---- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 14:44:31.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/10_linux.in      2013-12-18 14:44:49.000000000 +0100
-@@ -198,10 +198,12 @@
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-   initrd=
--  for i in "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" \
-+  if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
-+        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"
-+  else
-+        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}"
-+  fi
-+  for i in $initrd_search_list \
-          "initramfs-genkernel-${version}" \
-          "initramfs-genkernel-${alt_version}" \
-          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in grub-2.00.git20131218/util/grub.d/20_linux_xen.in
---- grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in     2013-12-18 14:44:31.000000000 +0100
-+++ grub-2.00.git20131218/util/grub.d/20_linux_xen.in  2013-12-18 14:44:49.000000000 +0100
-@@ -207,10 +207,12 @@
-       linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
- 
-       initrd=
--      for i in "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" \
-+      if [ x"${GRUB_PREFER_DRACUT}" != "xtrue" ]; then
-+          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"
-+      else
-+          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}"
-+      fi
-+      for i in $initrd_search_list \
-          "initramfs-genkernel-${version}" \
-          "initramfs-genkernel-${alt_version}" \
-          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \