From a10ff3f9066d1b304224ebac1271e44db174d850 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Thu, 27 May 2021 23:47:50 +0700 Subject: [PATCH] grub: fix 83rescue_fm.cfg, 85mediacheck.cfg Add multiple kernels support and initrd.img support instead full.cz. --- features.in/grub/cfg.in/83rescue_fm.cfg | 2 +- features.in/grub/cfg.in/85mediacheck.cfg | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/features.in/grub/cfg.in/83rescue_fm.cfg b/features.in/grub/cfg.in/83rescue_fm.cfg index 6600e126..fb0180ea 100644 --- a/features.in/grub/cfg.in/83rescue_fm.cfg +++ b/features.in/grub/cfg.in/83rescue_fm.cfg @@ -3,5 +3,5 @@ menuentry $"Forensic mode (leave disks alone)" --id 'rescue_forensic' { echo $"Loading Linux vmlinuz$KFLAVOUR ..." linux$linux_suffix /boot/vmlinuz fastboot live @initrd_bootargs@ @stagename@=rescue ramdisk_size=@rescue_size@ splash=0 showopts @rescue_bootargs@ $EFI_BOOTARGS max_loop=16 forensic hash=@rescue_hash@ echo $"Loading initial ramdisk ..." - initrd$linux_suffix /boot/full.cz + initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ } diff --git a/features.in/grub/cfg.in/85mediacheck.cfg b/features.in/grub/cfg.in/85mediacheck.cfg index 3040ecc0..4e2aec3d 100644 --- a/features.in/grub/cfg.in/85mediacheck.cfg +++ b/features.in/grub/cfg.in/85mediacheck.cfg @@ -1,4 +1,6 @@ menuentry $"Check this media for defects" --id 'mediachk' { - linux$linux_suffix /boot/vmlinuz live @initrd_bootargs@ @stagename@=mediacheck quiet lowmem mediacheck=1 showopts @bootargs@ $EFI_BOOTARGS - initrd$linux_suffix /boot/full.cz + echo $"Loading Linux vmlinuz$KFLAVOUR ..." + linux$linux_suffix /boot/vmlinuz$KFLAVOUR live @initrd_bootargs@ @stagename@=mediacheck quiet lowmem mediacheck=1 showopts @bootargs@ $EFI_BOOTARGS + echo $"Loading initial ramdisk ..." + initrd$linux_suffix /boot/@initrd@$KFLAVOUR.@initrd_ext@ }