summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-07-18 17:45:52 +0200
committerDaniel Baumann <daniel@debian.org>2012-07-18 17:45:52 +0200
commit23bf55a73c75f21dd8964a8b969be3049d4e7358 (patch)
tree23e2f4bbde7b8262ce2c6bcc057cf687102d0881 /scripts/build
parentb34c10519d97cf27dd4d741a3ef1ecef22c00a58 (diff)
downloadvyos-live-build-23bf55a73c75f21dd8964a8b969be3049d4e7358.tar.gz
vyos-live-build-23bf55a73c75f21dd8964a8b969be3049d4e7358.zip
Applying patch from Steven Shiau <steven@nchc.org.tw> to conditionally copy /etc/apt/secring.gpg* files.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_chroot_archives6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index fb4a9e8ee..168b3afe7 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -538,7 +538,11 @@ EOF
then
mkdir -p cache/indices.bootstrap
- cp -f chroot/etc/apt/secring.gpg* cache/indices.bootstrap
+ if Find_files chroot/etc/apt/secring.gpg*
+ then
+ cp -f chroot/etc/apt/secring.gpg* cache/indices.bootstrap
+ fi
+
cp -rf chroot/etc/apt/trusted.gpg* cache/indices.bootstrap
cp -f chroot/var/cache/apt/pkgcache.bin cache/indices.bootstrap