summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-01-05 21:25:01 +0000
committerLuca Boccassi <bluca@debian.org>2020-03-05 20:36:21 +0000
commit512dd582404be942fe24e0769bd7bb650c50137e (patch)
tree80e18b52cffc07e38144673ddbfdbdc005a6b4da /scripts
parent5c3679c882d4cdb7547edafb8d4a498446520f52 (diff)
downloadvyos-live-build-512dd582404be942fe24e0769bd7bb650c50137e.tar.gz
vyos-live-build-512dd582404be942fe24e0769bd7bb650c50137e.zip
archives: fix mount local repo comments
Closes: #952873
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/bootstrap_archives4
-rwxr-xr-xscripts/build/chroot_archives5
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index 0545f58f5..054b927e1 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -58,13 +58,13 @@ Create_lockfile .lock
# Restoring cache
Restore_cache cache/packages.chroot
-# Configure custom sources.list
-
+# Mount local repository
if echo "${LB_PARENT_MIRROR_CHROOT}" | grep -q '^file:/'
then
Chroot_bind_path chroot "$(echo ${LB_PARENT_MIRROR_CHROOT} | sed -e 's|file:||')"
fi
+# Configure custom sources.list
cat > chroot/etc/apt/${_PARENT_FILE} << EOF
deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}
EOF
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index fc5cc78d6..40cc25601 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -60,13 +60,14 @@ case "${1}" in
# Restoring cache
Restore_cache cache/packages.chroot
- # Configure custom sources.list
-
+ # Mount local repository
if echo "${LB_PARENT_MIRROR_CHROOT}" | grep -q '^file:/'
then
Chroot_bind_path chroot "$(echo ${LB_PARENT_MIRROR_CHROOT} | sed -e 's|file:||')"
fi
+ # Configure custom sources.list
+
cat > chroot/etc/apt/${_PARENT_FILE} << EOF
deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION_CHROOT} ${LB_PARENT_ARCHIVE_AREAS}
EOF