diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-01-27 11:16:25 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:05 +0200 |
| commit | d06b25079fb147be2cdc8a201662f7bc6da2211f (patch) | |
| tree | 82087ebe3f55a96c92618da7c56aaf04d1239f09 /scripts/build/chroot_archives | |
| parent | 3b7335e86b40620e506fca3f270ccb2c8b9d7edb (diff) | |
| download | vyos-live-build-d06b25079fb147be2cdc8a201662f7bc6da2211f.tar.gz vyos-live-build-d06b25079fb147be2cdc8a201662f7bc6da2211f.zip | |
Adding bootrap_archive-keys to establish secure trust-chain on top of debian-keyring for derivatives.
Diffstat (limited to 'scripts/build/chroot_archives')
| -rwxr-xr-x | scripts/build/chroot_archives | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index e8c375b09..af02739bd 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -554,13 +554,7 @@ EOF # Installing keyring packages if [ -n "${LB_KEYRING_PACKAGES}" ] then - if [ "${LB_DERIVATIVE}" = "true" ] - then - # Temporary hack (FIXME) - Chroot chroot "apt-get ${APT_OPTIONS} --force-yes install ${LB_KEYRING_PACKAGES}" - else - Apt chroot "install ${LB_KEYRING_PACKAGES}" - fi + Apt chroot "install ${LB_KEYRING_PACKAGES}" fi rm -rf chroot/var/cache/apt/*.bin |