summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-09-07 16:02:03 +0200
committerDaniel Baumann <daniel@debian.org>2011-09-07 16:02:03 +0200
commitc1169e2491a3257a12aa3c5f1826fd44156c3ad4 (patch)
tree4fcf8953dba0acd098322fc57836a713512175c3
parent0a32c8b6c06be399164fe25fe60c11c905d3df1b (diff)
downloadvyos-live-build-c1169e2491a3257a12aa3c5f1826fd44156c3ad4.tar.gz
vyos-live-build-c1169e2491a3257a12aa3c5f1826fd44156c3ad4.zip
Setting origin in apt release files for local packages to config/packages.chroot.
-rwxr-xr-xscripts/build/lb_chroot_apt2
-rwxr-xr-xscripts/build/lb_chroot_archives2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt
index 2e00004c4..5a097c787 100755
--- a/scripts/build/lb_chroot_apt
+++ b/scripts/build/lb_chroot_apt
@@ -113,7 +113,7 @@ case "${1}" in
echo >> chroot/etc/apt/preferences
echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences
echo "Package: *" >> chroot/etc/apt/preferences
- echo "Pin: release o=chroot_packages" >> chroot/etc/apt/preferences
+ echo "Pin: release o=config/packages.chroot" >> chroot/etc/apt/preferences
case "${1}" in
install)
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index ab767abcb..f1b22ed88 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -337,7 +337,7 @@ EOF
# Generate Release
echo "cd /root/packages && apt-ftparchive \
- -o APT::FTPArchive::Release::Origin=chroot_packages \
+ -o APT::FTPArchive::Release::Origin=config/packages.chroot \
release . > Release" | Chroot chroot sh
if [ "${LB_APT_SECURE}" = "true" ]