diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-02-21 20:52:37 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:36:07 +0100 |
| commit | b0c38d67e23c0fbbc0eb6264f81ed7594623cea5 (patch) | |
| tree | aa15ffe95d6deddcb1be3abb100e432303ec2602 /functions | |
| parent | 953a3d1af6f82d93af4fed3ce98160cf83f1e099 (diff) | |
| download | live-build-b0c38d67e23c0fbbc0eb6264f81ed7594623cea5.zip live-build-b0c38d67e23c0fbbc0eb6264f81ed7594623cea5.tar.gz | |
Renaming LH_MIRROR_BOOTSTRAP* to LH_MIRROR_CHROOT and introducing dedicated LH_MIRROR_BOOTSTRAP for debootstrap/cdebootstrap only.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 177520f..2640d52 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 |