manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Adrian Gibanel Lopez 2017-12-16 23:01:33 +00:00 committed by Raphaël Hertzog
parent d3edb76ad4
commit acafe6618b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -5,6 +5,9 @@ live-build (1:20171208) UNRELEASED; urgency=medium
Thanks to Adrian Gibanel Lopez for the patch. Thanks to Adrian Gibanel Lopez for the patch.
* Fix handling of multiple kernels in binary_loopback_cfg. * Fix handling of multiple kernels in binary_loopback_cfg.
Closes: #884588 Thanks to Adrian Gibanel Lopez for the patch. 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 -- Raphaël Hertzog <hertzog@debian.org> Thu, 21 Dec 2017 14:14:04 +0100

19
scripts/build/binary_loopback_cfg
View File

@ -199,14 +199,23 @@ if [ "${_AMD64_686_NUMBER}" -ge 2 ] ; then
"/${INITFS}/${AMD64_INITRD}" \ "/${INITFS}/${AMD64_INITRD}" \
"/${INITFS}/${_686_KERNEL}" \ "/${INITFS}/${_686_KERNEL}" \
"/${INITFS}/${_686_INITRD}" \ "/${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 else
Grub_live_entry "Live system" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${APPEND_LIVE}" Grub_live_entry "Live system" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${APPEND_LIVE}"
fi if [ "${LB_BOOTAPPEND_LIVE_FAILSAFE}" != "none" ]
then
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}" Grub_live_entry "Live system (fail-safe mode)" "/${INITFS}/${DEFAULT_KERNEL}" "/${INITFS}/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_LIVE_FAILSAFE}"
fi
fi fi
_COUNT=0 _COUNT=0