From c6fa0ca0421a5353348ed8a16c56e3481ae12129 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 21 Feb 2008 20:52:37 +0100
Subject: Renaming LH_MIRROR_BOOTSTRAP* to LH_MIRROR_CHROOT and introducing
 dedicated LH_MIRROR_BOOTSTRAP for debootstrap/cdebootstrap only.

---
 functions/defaults.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'functions')

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 177520fc4..2640d523b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -277,10 +277,12 @@ Set_defaults ()
 		esac
 	fi
 
+	LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT:-${LH_MIRROR_BOOTSTRAP}}"
+
 	# Setting security mirror to fetch packages from
-	if [ -z "${LH_MIRROR_BOOTSTRAP_SECURITY}" ]
+	if [ -z "${LH_MIRROR_CHROOT_SECURITY}" ]
 	then
-		LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
+		LH_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
 	fi
 
 	# Setting mirror which ends up in the image
@@ -462,7 +464,7 @@ Set_defaults ()
 	# LH_TASKS
 
 	# Setting security updates option
-	if [ "${LH_MIRROR_BOOTSTRAP_SECURITY}" = "none" ] || [ "${LH_MIRROR_BINARY_SECURITY}" = "none" ]
+	if [ "${LH_MIRROR_CHROOT_SECURITY}" = "none" ] || [ "${LH_MIRROR_BINARY_SECURITY}" = "none" ]
 	then
 		LH_SECURITY="disabled"
 	fi
-- 
cgit v1.2.3