templates: Improve initramfs detection

Add detection for initramfs of the form *.img.old. For example, Gentoo's
sys-kernel/genkernel installs it as initramfs-*.img and moves any existing
one to initramfs-*.img.old.

Apply the same scheme to initrd-*.img and initrd-*.gz files for consistency.

Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index ca068038ee193732bb4e11d7ef28190fa697789f..b4a4d6900b0ab6327b3605ef2973de406c413151 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -215,8 +215,10 @@ while [ "x$list" != "x" ] ; do
   done
 
   initrd_real=
-  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
-          "initrd-${version}" "initramfs-${version}.img" \
+  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" \
           "initramfs-genkernel-${version}" \

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index f45559ff8ec61a72735a1e7142f0d4e0f9644103..51a9839268acb7629050229396c2c65bc0ef9d8d 100644 (file)
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -284,8 +284,10 @@ while [ "x${xen_list}" != "x" ] ; do
        linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
        initrd_real=
-       for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
-          "initrd-${version}" "initramfs-${version}.img" \
+       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" \
           "initramfs-genkernel-${version}" \