From acafe6618bfb7a9f7525e723e13ade2956e10b4f Mon Sep 17 00:00:00 2001 From: Adrian Gibanel Lopez Date: Sat, 16 Dec 2017 23:01:33 +0000 Subject: Failsafe entries rework at binary_loopback_cfg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [hertzog@debian.org: - Fix conflicts due to renamed variables ] Signed-off-by: Raphaël Hertzog --- scripts/build/binary_loopback_cfg | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'scripts/build/binary_loopback_cfg') diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index ff487a40f..f710ed483 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -199,14 +199,23 @@ if [ "${_AMD64_686_NUMBER}" -ge 2 ] ; then "/${INITFS}/${AMD64_INITRD}" \ "/${INITFS}/${_686_KERNEL}" \ "/${INITFS}/${_686_INITRD}" \ - "$APPEND_LIVE" + "${APPEND_LIVE}" + + if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ] + then + Grub_live_autodetect_entry "Live system (autodetect) (fail-safe mode)" \ + "/${INITFS}/${AMD64_KERNEL}" \ + "/${INITFS}/${AMD64_INITRD}" \ + "/${INITFS}/${_686_KERNEL}" \ + "/${INITFS}/${_686_INITRD}" \ + "${LB_BOOTAPPEND_LIVE_FAILSAFE}" + fi else Grub_live_entry "Live system" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${APPEND_LIVE}" -fi - -if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ] -then - Grub_live_entry "Live system (fail-safe mode)" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}" + if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ] + then + Grub_live_entry "Live system (fail-safe mode)" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}" + fi fi _COUNT=0 -- cgit v1.2.3