Using /boot on live media instead of /isolinux or /syslinux in progress mode.

This commit is contained in:
Daniel Baumann 2012-05-23 07:17:15 +02:00
parent f759856a78
commit 69194996f7
3 changed files with 44 additions and 4 deletions

View File

@ -55,6 +55,7 @@ do
cd binary
find . -type f \
\! -path './isolinux/isolinux.bin' \
\! -path './boot/boot.bin' \
\! -path './boot/grub/stage2_eltorito' \
\! -path './md5sum.txt' \
\! -path './sha1sum.txt' \

View File

@ -127,8 +127,17 @@ case "${LB_BOOTLOADER}" in
syslinux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
case "${LB_MODE}" in
progress)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
GENISOIMAGE_EXCLUDE="boot/boot.bin"
;;
*)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
;;
esac
;;
yaboot)

View File

@ -51,7 +51,16 @@ Check_crossarchitectures
case "${LB_BINARY_IMAGES}" in
iso*)
_BOOTLOADER="isolinux"
_TARGET="binary/isolinux"
case "${LB_MODE}" in
progress)
_TARGET="binary/boot"
;;
*)
_TARGET="binary/isolinux"
;;
esac
;;
net*)
@ -61,7 +70,16 @@ case "${LB_BINARY_IMAGES}" in
hdd*|*)
_BOOTLOADER="syslinux"
_TARGET="binary/syslinux"
case "${LB_MODE}" in
progress)
_TARGET="binary/boot"
;;
*)
_TARGET="binary/syslinux"
;;
esac
;;
esac
@ -222,6 +240,18 @@ then
${_TARGET}/install.cfg
fi
case "${LB_MODE}" in
progress)
for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg"
do
if [ -e "${_FILE}" ]
then
mv "${_FILE}" $(echo ${_FILE} | sed -e 's|.*linux|boot|')
fi
done
;;
esac
case "${LB_BUILD_WITH_CHROOT}" in
true)
# Saving cache