- merged 2.12 from PLD

[packages/grub2.git] / initrd-search.patch

diff --git a/initrd-search.patch b/initrd-search.patch
index bf7207c557e7972d89802fb03fe118bb9fbfa574..66f8e58fb4f13e21570370fd856aac71478b1556 100644 (file)
--- a/initrd-search.patch
+++ b/initrd-search.patch
@@ -1,30 +1,34 @@
-diff -ur grub-2.02-beta2.orig/util/grub.d/10_linux.in grub-2.02-beta2/util/grub.d/10_linux.in
---- grub-2.02-beta2.orig/util/grub.d/10_linux.in       2013-12-24 20:53:23.000000000 +0000
-+++ grub-2.02-beta2/util/grub.d/10_linux.in    2015-08-04 11:09:27.932635208 +0000
-@@ -185,10 +185,7 @@
-   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+diff -ur grub-2.12.orig/util/grub.d/10_linux.in grub-2.12/util/grub.d/10_linux.in
+--- grub-2.12.orig/util/grub.d/10_linux.in     2024-01-09 00:18:44.453971622 +0100
++++ grub-2.12/util/grub.d/10_linux.in  2024-01-09 00:25:52.553521455 +0100
+@@ -223,12 +223,7 @@
+   done
  
-   initrd=
--  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
--         "initrd-${version}" "initramfs-${version}.img" \
+   initrd_real=
+-  for i in "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" \
-+  for i in "initramfs-${version}.img initramfs-${alt_version}.img" \
++  for i in "initramfs-${version}.img" "initramfs-${alt_version}.img" \
           "initramfs-genkernel-${version}" \
           "initramfs-genkernel-${alt_version}" \
           "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-diff -ur grub-2.02-beta2.orig/util/grub.d/20_linux_xen.in grub-2.02-beta2/util/grub.d/20_linux_xen.in
---- grub-2.02-beta2.orig/util/grub.d/20_linux_xen.in   2013-12-24 20:53:23.000000000 +0000
-+++ grub-2.02-beta2/util/grub.d/20_linux_xen.in        2015-08-04 11:10:18.928635208 +0000
-@@ -213,10 +213,7 @@
+diff -ur grub-2.12.orig/util/grub.d/20_linux_xen.in grub-2.12/util/grub.d/20_linux_xen.in
+--- grub-2.12.orig/util/grub.d/20_linux_xen.in 2024-01-09 00:18:44.453971622 +0100
++++ grub-2.12/util/grub.d/20_linux_xen.in      2024-01-09 00:26:19.353868889 +0100
+@@ -295,12 +295,7 @@
        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_real=
+-      for i in "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" \
-+      for i in "initramfs-${version}.img initramfs-${alt_version}.img" \
++        for i in "initramfs-${version}.img" "initramfs-${alt_version}.img" \
           "initramfs-genkernel-${version}" \
           "initramfs-genkernel-${alt_version}" \
           "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \