diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 12:01:03 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:23:30 +0200 |
| commit | c3f0d39675de3cc69542416ea6f954b1d67c6962 (patch) | |
| tree | ab71fee6a9c86d9305143d06dc4e71b51f89a821 | |
| parent | c57b8679a4664c83c50648c106ba224048cedeee (diff) | |
| download | vyos-live-build-c3f0d39675de3cc69542416ea6f954b1d67c6962.tar.gz vyos-live-build-c3f0d39675de3cc69542416ea6f954b1d67c6962.zip | |
config: apt-get should probably be an allowed and documented --apt value
since everywhere where 'apt' is a permitted value, 'apt-get' is also, it
just wasn't listed in the option's documentation and thus was also not
listed in the new validation check.
Gbp-Dch: Short
| -rwxr-xr-x | functions/configuration.sh | 2 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 4 | ||||
| -rwxr-xr-x | scripts/build/config | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh index decc564be..be3adf621 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -587,7 +587,7 @@ Validate_config_permitted_values () exit 1 fi - if ! In_list "${LB_APT}" apt aptitude; then + if ! In_list "${LB_APT}" apt apt-get aptitude; then Echo_error "You have specified an invalid value for LB_APT (--apt)." exit 1 fi diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 4b258f8a0..be4e8b314 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -8,7 +8,7 @@ .PP \fBlb config\fR .br - [\fB\-\-apt\fR apt|aptitude] + [\fB\-\-apt\fR apt|apt-get|aptitude] .br [\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR] .br @@ -250,7 +250,7 @@ Note: \fBlb config\fR tries to be smart and sets defaults for some options depen .SH OPTIONS In addition to its specific options \fBlb config\fR understands all generic live\-build options. See \fIlive\-build\fR(7) for a complete list of all generic live\-build options. .PP -.IP "\fB\-\-apt\fR apt|aptitude" 4 +.IP "\fB\-\-apt\fR apt|apt-get|aptitude" 4 defines if apt\-get or aptitude is used to install packages when building the image. The default is apt. .IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4 sets the FTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else. diff --git a/scripts/build/config b/scripts/build/config index eb5d139b7..d486707ea 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -17,7 +17,7 @@ set -e # Setting static variables PROGRAM="lb config" DESCRIPTION="Create configuration for live-build(7)" -USAGE="${PROGRAM} [--apt apt|aptitude]\n\ +USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\ \t [--apt-ftp-proxy URL]\n\ \t [--apt-http-proxy URL]\n\ \t [--apt-indices true|false]\n\ |