mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-24 16:19:22 +00:00
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>
This commit is contained in:
1 parent
ea1b565e8c
commit
3efd7912d9
2 files changed
+8
-4
No files matched your search
@@ -215,8 +215,10 @@ while [ "x$list" != "x" ] ; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
initrd_real=
|
initrd_real=
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
for i in "initrd.img-${version}" "initrd-${version}.img" \
|
||||||
"initrd-${version}" "initramfs-${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.img-${alt_version}" "initrd-${alt_version}.img" \
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||||
"initramfs-genkernel-${version}" \
|
"initramfs-genkernel-${version}" \
|
||||||
|
|||||||
@@ -284,8 +284,10 @@ while [ "x${xen_list}" != "x" ] ; do
|
|||||||
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
|
||||||
|
|
||||||
initrd_real=
|
initrd_real=
|
||||||
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
|
for i in "initrd.img-${version}" "initrd-${version}.img" \
|
||||||
"initrd-${version}" "initramfs-${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.img-${alt_version}" "initrd-${alt_version}.img" \
|
||||||
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
"initrd-${alt_version}" "initramfs-${alt_version}.img" \
|
||||||
"initramfs-genkernel-${version}" \
|
"initramfs-genkernel-${version}" \
|
||||||
|
|||||||
Reference in new issue
Block a user