From faa51b83c5c46611c856b13064b0087b8999de4c Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 28 Mar 2020 15:07:06 +0000 Subject: config: fix mistake in mirror url tidying Gbp-Dch: Ignore --- functions/configuration.sh | 9 +++++---- 1 file 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}}" -- cgit v1.2.3