diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-02-03 10:30:10 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:09:41 +0100 |
| commit | 4d3525ab0f50c893e98170154d60503f23a34250 (patch) | |
| tree | b93c2803fc138908ea3b7debcb1dcda07219c152 | |
| parent | 4fb3f719758f1bfa54d3017215cd43cc9fbd117d (diff) | |
| download | vyos-live-build-4d3525ab0f50c893e98170154d60503f23a34250.tar.gz vyos-live-build-4d3525ab0f50c893e98170154d60503f23a34250.zip | |
Correcting order of genisoimage option assembling, the exludes do have to be processed last.
| -rwxr-xr-x | helpers/lh_binary_iso | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 546c30355..0b8bb5540 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -91,14 +91,6 @@ then GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\"" fi -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) @@ -132,6 +124,14 @@ 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 binary EOF |