- add option to choose which initrd should grub-mkconfig use (dracut or geninitrd)

diff --git a/choose-preferred-initrd.patch b/choose-preferred-initrd.patch
new file mode 100644 (file)
index 0000000..bd1c06f
--- /dev/null
+++ b/choose-preferred-initrd.patch
@@ -0,0 +1,37 @@
+--- grub-2.00/util/grub-mkconfig.in~   2013-04-15 00:03:09.162253769 +0200
++++ grub-2.00/util/grub-mkconfig.in    2013-04-15 01:39:22.112705322 +0200
+@@ -233,7 +233,8 @@
+   GRUB_SAVEDEFAULT \
+   GRUB_ENABLE_CRYPTODISK \
+   GRUB_BADRAM \
+-  GRUB_DISABLE_SUBMENU
++  GRUB_DISABLE_SUBMENU \
++  GRUB_PREFER_DRACUT
+ 
+ if test "x${grub_cfg}" != "x"; then
+   rm -f "${grub_cfg}.new"
+--- grub-2.00/util/grub.d/10_linux.in~ 2013-04-15 00:03:09.162253769 +0200
++++ grub-2.00/util/grub.d/10_linux.in  2013-04-15 01:38:26.992181771 +0200
+@@ -191,10 +191,18 @@
+   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}" = "x" ]; 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 --git a/grub.sysconfig b/grub.sysconfig
index 4449a26aae463e4bdfe893efa21fcc3b7513cbfe..6d0d59998498689780b0e8c329e40563d9ca18bb 100644 (file)
--- a/grub.sysconfig
+++ b/grub.sysconfig
@@ -42,5 +42,10 @@ GRUB_DISABLE_RECOVERY="true"
 # Disable creating "advanced" submenus, just use flat list
 GRUB_DISABLE_SUBMENU="true"
 
+# Control which initial ramdisk should grub-mkconfig prefer when searching
+# default is initrd-*.gz created by geninitrd, uncomment to make it prefer
+# initramfs-*.img created by dracut
+#GRUB_PREFER_DRACUT="true"
+
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"

diff --git a/grub2.spec b/grub2.spec
index aaa16557db2180f55ea58f42f3f4854fa498d810..4e995277967560645185b131e4cddd8bccd2e351 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -81,6 +81,7 @@ Patch17:      fix-http-crash.patch
 Patch18:       Issue-separate-DNS-queries-for-ipv4-and-ipv6.patch
 Patch19:       search-for-specific-config-file-for-netboot.patch
 Patch20:       ignore-kernel-symlinks.patch
+Patch21:       choose-preferred-initrd.patch
 URL:           http://www.gnu.org/software/grub/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.11.1-1
@@ -304,6 +305,7 @@ Motyw starfield dla GRUB-a.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %if "%{cc_version}" < "3.4"
 grep -rl -- -Wno-missing-field-initializers . | xargs %{__sed} -i -e 's,-Wno-missing-field-initializers,,'