diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-10-30 09:27:21 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:43 +0100 |
| commit | 3a2d87b74bebc2ceef133c2608f39bdcc1646056 (patch) | |
| tree | 8e79c90dc1afe09755de09ce9d9b74c2871700f8 | |
| parent | 0eaf9e512235eedca5f59e25c233268dda940683 (diff) | |
| download | vyos-live-build-3a2d87b74bebc2ceef133c2608f39bdcc1646056.tar.gz vyos-live-build-3a2d87b74bebc2ceef133c2608f39bdcc1646056.zip | |
Slightly reordering genisoimage option assembling.
| -rwxr-xr-x | helpers/lh_binary_iso | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index b5d3d6ab2..42d497ab2 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -62,6 +62,10 @@ then rm -f binary.iso fi +# Handle genisoimage generic options +GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot" + +# Handle genisoimage live-helper specific options if [ "${LH_QUIET}" = "enabled" ] then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" @@ -92,7 +96,15 @@ then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\"" 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 grub) GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" @@ -124,16 +136,8 @@ case "${LH_BOOTLOADER}" in ;; 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 -genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso -J -l -cache-inodes -allow-multidot binary +genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary EOF case "${LH_CHROOT_BUILD}" in |