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

Slightly reordering genisoimage option assembling.

This commit is contained in:
Daniel Baumann 2008-10-30 09:27:21 +01:00
parent 0eaf9e5122
commit 3a2d87b74b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
helpers/lh_binary_iso
View File

@ -62,6 +62,10 @@ then
rm -f binary.iso rm -f binary.iso
fi fi
# Handle genisoimage generic options
GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
# Handle genisoimage live-helper specific options
if [ "${LH_QUIET}" = "enabled" ] if [ "${LH_QUIET}" = "enabled" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
@ -92,7 +96,15 @@ then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\"" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
fi fi
# Create image if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
then
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
fi
fi
# Handle genisoimage architecture specific options
case "${LH_BOOTLOADER}" in case "${LH_BOOTLOADER}" in
grub) grub)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
@ -124,16 +136,8 @@ case "${LH_BOOTLOADER}" in
;; ;;
esac esac
if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
then
if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
fi
fi
cat > binary.sh << EOF cat > binary.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary
EOF EOF
case "${LH_CHROOT_BUILD}" in case "${LH_CHROOT_BUILD}" in