diff options
| author | Adrian Gibanel Lopez <adrian.gibanel@btactic.com> | 2017-12-16 23:01:33 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2017-12-21 14:29:58 +0100 |
| commit | acafe6618bfb7a9f7525e723e13ade2956e10b4f (patch) | |
| tree | d7fb78c69dde380e182faa4f4b5aba9e3b7de2b2 | |
| parent | d3edb76ad43b81b734dc84588a4e44c51dc90a44 (diff) | |
| download | vyos-live-build-acafe6618bfb7a9f7525e723e13ade2956e10b4f.tar.gz vyos-live-build-acafe6618bfb7a9f7525e723e13ade2956e10b4f.zip | |
Failsafe entries rework at binary_loopback_cfg
[hertzog@debian.org:
- Fix conflicts due to renamed variables
]
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 21 |
2 files changed, 18 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index e4b5b449f..fef7d9f89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ live-build (1:20171208) UNRELEASED; urgency=medium Thanks to Adrian Gibanel Lopez for the patch. * Fix handling of multiple kernels in binary_loopback_cfg. Closes: #884588 Thanks to Adrian Gibanel Lopez for the patch. + * Rework failsafe entries in grub configuration to be more + consistent with the i386/amd64 autodetection entries. + Closes: #884591 Thanks to Adrian Gibanel Lopez for the patch. -- Raphaël Hertzog <hertzog@debian.org> Thu, 21 Dec 2017 14:14:04 +0100 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 |