diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 13:41:01 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-05-02 13:46:41 +0100 |
| commit | da1fab116139150db562eb2c104dea55b7535a33 (patch) | |
| tree | d10223875315beb26115911072940998e0cc6562 /scripts/build/chroot_apt | |
| parent | 5f318c5a444ef05bdf79b1f7640294c7423fd10e (diff) | |
| download | vyos-live-build-da1fab116139150db562eb2c104dea55b7535a33.tar.gz vyos-live-build-da1fab116139150db562eb2c104dea55b7535a33.zip | |
output error for incorrect action in chroot prep scripts
...alongside printing usage (which is perhaps unnecessary), so that it is
actually clear to users that a problem occurred, and what.
and capture it before option processing of remaining args.
Gbp-Dch: Ignore
Diffstat (limited to 'scripts/build/chroot_apt')
| -rwxr-xr-x | scripts/build/chroot_apt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index ad5c54816..b1fceffaa 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -18,6 +18,9 @@ set -e DESCRIPTION="Manage /etc/apt/apt.conf" USAGE="${PROGRAM} {install|install-binary|remove} [--force]" +_ACTION="${1}" +shift + # Processing arguments and configuration files Init_config_data "${@}" @@ -26,7 +29,7 @@ Require_stagefiles config bootstrap CONFD="chroot/etc/apt/apt.conf.d" -case "${1}" in +case "${_ACTION}" in install|install-binary) Echo_message "Configuring file /etc/apt/apt.conf" @@ -220,6 +223,7 @@ case "${1}" in ;; *) + Echo_error "Invalid action parameter: '${_ACTION}'" Usage --fail ;; esac |