[SCM] live-build branch, debian-next, updated. debian/3.0_a61-1-13-g711d650
Daniel Baumann
daniel at debian.org
Mon Oct 1 03:01:19 UTC 2012
The following commit has been merged in the debian-next branch:
commit 711d6504f176ac81c74f988c564e85667643acd9
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Oct 1 05:01:18 2012 +0200
Using menu default only once when populating syslinux configurations for more than one kernel flavour (Closes: #682957).
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index bf2fb03..081b55c 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -238,12 +238,19 @@ then
mv binary/live/vmlinuz-*-${_FLAVOUR} binary/live/vmlinuz${_NUMBER}
mv binary/live/initrd.img-*-${_FLAVOUR} binary/live/initrd${_NUMBER}.img
- sed -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
- -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
- -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
- -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
- -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
- "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
+ if [ "${_NUMBER}" -gt 1 ]
+ then
+ grep -v 'menu default' "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
+ else
+ cat "${_TARGET}/live.cfg.in" >> "${_TARGET}/live.cfg"
+ fi
+
+ sed -i -e "s|@FLAVOUR@|${_FLAVOUR}|g" \
+ -e "s|@LINUX@|/live/vmlinuz${_NUMBER}|g" \
+ -e "s|@INITRD@|/live/initrd${_NUMBER}.img|g" \
+ -e "s|@APPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
+ -e "s|@APPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
+ "${_TARGET}/live.cfg"
done
rm -f "${_TARGET}/live.cfg.in"
--
live-build
More information about the debian-live-changes
mailing list