diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-06-20 01:31:21 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:03:36 +0100 |
| commit | 5e310e0fcaa0f41fd079b9ef8c35daffb92801ef (patch) | |
| tree | 4f573feba9e638585b7fd1662005473485ff48bf /helpers/lh_binary_iso | |
| parent | b7ccfa63cac8e9cbfd3e2cf5173c21f148e2a23e (diff) | |
| download | vyos-live-build-5e310e0fcaa0f41fd079b9ef8c35daffb92801ef.tar.gz vyos-live-build-5e310e0fcaa0f41fd079b9ef8c35daffb92801ef.zip | |
Migrate a few uses of grep to In_list.
Diffstat (limited to 'helpers/lh_binary_iso')
| -rwxr-xr-x | helpers/lh_binary_iso | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 32d4148b4..0fc09e275 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -28,7 +28,7 @@ Arguments "${@}" Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if ! echo "${LH_BINARY_IMAGES}" | grep -qs iso +if ! In_list iso "${LH_BINARY_IMAGES}" then exit 0 fi @@ -124,13 +124,12 @@ case "${LH_BOOTLOADER}" in ;; esac -if [ "${LH_DEBIAN_INSTALLER}" != "live" ] +if In_list "stripped minimal" "${LH_PACKAGES_LISTS}" then - case "${LH_PACKAGES_LISTS}" in - stripped|minimal) - GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" - ;; - esac + if [ "${LH_DEBIAN_INSTALLER}" != "live" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" + fi fi cat > binary.sh << EOF |