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 /helpers/lh_chroot_sources | |
| 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 'helpers/lh_chroot_sources')
| -rwxr-xr-x | helpers/lh_chroot_sources | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 2b4e8a2..8e0dc98 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -50,22 +50,22 @@ case "${1}" in Create_lockfile .lock # Configure custom sources.list - echo "deb ${LH_MIRROR_BOOTSTRAP} ${LH_DISTRIBUTION} ${LH_SECTIONS}" > chroot/etc/apt/sources.list + echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_SECTIONS}" > chroot/etc/apt/sources.list if [ "${LH_SOURCE}" = "enabled" ] then - echo "deb-src ${LH_MIRROR_BOOTSTRAP} ${LH_DISTRIBUTION} ${LH_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_SECTIONS}" >> chroot/etc/apt/sources.list fi if [ "${LH_SECURITY}" = "enabled" ] then if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ] then - echo "deb ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list if [ "${LH_SOURCE}" = "enabled" ] then - echo "deb-src ${LH_MIRROR_BOOTSTRAP_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list + echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_SECTIONS}" >> chroot/etc/apt/sources.list fi fi fi @@ -197,8 +197,8 @@ case "${1}" in if [ "${LH_BINARY_INDICES}" = "enabled" ] then # Don't do anything if it's not required - if [ "${LH_MIRROR_BOOTSTRAP}" = "${LH_MIRROR_BINARY}" ] && \ - [ "${LH_MIRROR_BOOTSTRAP_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] + if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \ + [ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] then # Removing stage file rm -f .stage/chroot_sources |