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

Using menu default only once when populating syslinux configurations for more than one kernel flavour (Closes: #682957).

This commit is contained in:
Daniel Baumann 2012-10-01 05:01:18 +02:00
parent 5b8cfdc193
commit 711d6504f1
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/build/binary_syslinux
View File

@ -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"