summaryrefslogtreecommitdiff
path: root/functions/configuration.sh
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-28 15:07:06 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:51:53 +0200
commitfaa51b83c5c46611c856b13064b0087b8999de4c (patch)
tree616c8b4d3a17b392cc9f84a2798a7b0b8148c6e2 /functions/configuration.sh
parentba052474382867ffe303567df902d66d426f9dce (diff)
downloadvyos-live-build-faa51b83c5c46611c856b13064b0087b8999de4c.tar.gz
vyos-live-build-faa51b83c5c46611c856b13064b0087b8999de4c.zip
config: fix mistake in mirror url tidying
Gbp-Dch: Ignore
Diffstat (limited to 'functions/configuration.sh')
-rwxr-xr-xfunctions/configuration.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/functions/configuration.sh b/functions/configuration.sh
index 75b2f35c6..c0c39f250 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -200,18 +200,19 @@ Prepare_config ()
fi
# Mirrors:
- # *_MIRROR_CHROOT: to fetch packages from
# *_MIRROR_BOOTSTRAP: to fetch packages from
+ # *_MIRROR_CHROOT: to fetch packages from
# *_MIRROR_CHROOT_SECURITY: security mirror to fetch packages from
# *_MIRROR_BINARY: mirror which ends up in the image
# *_MIRROR_BINARY_SECURITY: security mirror which ends up in the image
# *_MIRROR_DEBIAN_INSTALLER: to fetch installer from
- LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT:-${LB_MIRROR_BOOTSTRAP}}"
- LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
if [ "${LB_MODE}" = "debian" ]; then
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://deb.debian.org/debian/}"
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
-
+ fi
+ LB_MIRROR_CHROOT="${LB_MIRROR_CHROOT:-${LB_MIRROR_BOOTSTRAP}}"
+ LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}"
+ if [ "${LB_MODE}" = "debian" ]; then
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"