diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-01-27 11:16:25 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2013-02-08 21:40:27 +0100 |
| commit | 628c93f923da2a3693d8467517bb919cc1d5c591 (patch) | |
| tree | 6495c3b759d91d9d99cba18d5a55788fd5587d9c /scripts/build/chroot_archives | |
| parent | 74dbadf2ff2cb63b9ad7e261bc0fc7c5ed35b33a (diff) | |
| download | vyos-live-build-628c93f923da2a3693d8467517bb919cc1d5c591.tar.gz vyos-live-build-628c93f923da2a3693d8467517bb919cc1d5c591.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 2e02c5448..06e16fb78 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 |