diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-22 15:12:01 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-03-05 11:09:41 +0000 |
| commit | 849873daca23a2f0939a4a6cd0b68d1d75eea05b (patch) | |
| tree | d82e137b41cf3c7b86f2a9950cfdbbfae3d20da2 | |
| parent | 0d4b4643707e16ef0dbf5e8b83f60427b5b5a34b (diff) | |
| download | vyos-live-build-849873daca23a2f0939a4a6cd0b68d1d75eea05b.tar.gz vyos-live-build-849873daca23a2f0939a4a6cd0b68d1d75eea05b.zip | |
bootstrap: drop obsolete check for `--no-check-gpg` support in debootstrap
This has been present in debootstrap since version 1.0.30.
Gbp-Dch: Short
Closes: #952847
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 48a20fe19..6efb7e8a2 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -71,8 +71,7 @@ then fi # If LB_APT_SECURE is false, do not check signatures of the Release file -# (requires debootstrap >= 1.0.30) -if [ "${LB_APT_SECURE}" = "false" ] && /usr/sbin/debootstrap --help | grep -qs '\-\-no-check-gpg' +if [ "${LB_APT_SECURE}" = "false" ] then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --no-check-gpg" fi |