diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-08-05 08:53:27 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-08-08 08:10:07 +0200 |
| commit | 724f5b4dc82d2b77279a8daad715878a14a41090 (patch) | |
| tree | c9c7b66ba2422e487d9f3ebd94c6ea56002c27b4 /scripts/build/lb_chroot_archives | |
| parent | 8a0da5726657de9024197bdb4c17f35423199a0a (diff) | |
| download | vyos-live-build-724f5b4dc82d2b77279a8daad715878a14a41090.tar.gz vyos-live-build-724f5b4dc82d2b77279a8daad715878a14a41090.zip | |
Also using definition files without suffix (so that e.g. foo.list is used for both chroot and binary stage).
Diffstat (limited to 'scripts/build/lb_chroot_archives')
| -rwxr-xr-x | scripts/build/lb_chroot_archives | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives index 4de3ef7fd..5c27c1a2c 100755 --- a/scripts/build/lb_chroot_archives +++ b/scripts/build/lb_chroot_archives @@ -256,9 +256,11 @@ EOF fi # Check local sources.list - if Find_files config/archives/*.list.chroot + if Find_files config/archives/*.list || \ + Find_files config/archives/*.list.chroot then - for FILE in config/archives/*.list.chroot + for FILE in config/archives/*.list \ + config/archives/*.list.chroot do sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ @@ -466,9 +468,11 @@ EOF fi else # Get fresh indices # Check local archive keys - if Find_files config/archives/*.key.chroot + if Find_files config/archives/*.key || \ + Find_files config/archives/*.key.chroot then - for FILE in config/archives/*.key.chroot + for FILE in config/archives/*.key \ + config/archives/*.key.chroot do cp ${FILE} chroot/root Chroot chroot "apt-key add /root/$(basename ${FILE})" @@ -775,9 +779,11 @@ EOF fi # Check local sources.list - if Find_files config/archives/*.list.binary + if Find_files config/archives/*.list || \ + Find_files config/archives/*.list.binary then - for FILE in config/archives/*.list.binary + for FILE in config/archives/*.list \ + config/archives/*.list.binary do sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ @@ -788,9 +794,11 @@ EOF fi # Check local archive keys - if Find_files config/archives/*.key.binary + if Find_files config/archives/*.key || \ + Find_files config/archives/*.key.binary then - for FILE in config/archives/*.key.binary + for FILE in config/archives/*.key \ + config/archives/*.key.binary do cp ${FILE} chroot/root Chroot chroot "apt-key add /root/$(basename ${FILE})" |