diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 05:13:11 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 14:51:09 +0200 |
| commit | 39e4d3e3cbcc8d37700cfe46a95f669b4d9479ea (patch) | |
| tree | e30a4295f421d6386d16a310c58659a0058f93f7 /scripts/build/binary_includes | |
| parent | cede584a5cece40511c94fcec31569218d00419c (diff) | |
| download | vyos-live-build-39e4d3e3cbcc8d37700cfe46a95f669b4d9479ea.tar.gz vyos-live-build-39e4d3e3cbcc8d37700cfe46a95f669b4d9479ea.zip | |
--binary-images can support only a single type
whilst some parts of the codebase were set up to work with multiple types
specified, others did not work with it and would not necessarily be easy
to adjust. this thus makes some tweaks to adjust things accordingly.
- option renamed to singular form (maintaining backwards compatibility)
- a validation check has been added
- unnecessary glob style type references fixed
- checks with In_list changed to a direct singular comparison
- typo of type "netboot" written as just "net" fixed (though unreachable
so of no consequence; really the code could be removed but it's trivial)
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_includes')
| -rwxr-xr-x | scripts/build/binary_includes | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes index e8af34c63..b9482a552 100755 --- a/scripts/build/binary_includes +++ b/scripts/build/binary_includes @@ -40,11 +40,9 @@ then cd "${OLDPWD}" # Removing symlinks - case "${LIVE_IMAGE_TYPE}" in - hdd*) - find binary -type l | xargs rm -f - ;; - esac + if [ "${LIVE_IMAGE_TYPE}" = "hdd" ]; then + find binary -type l | xargs rm -f + fi fi # Creating stage file |