diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-12-13 21:17:45 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:03 +0100 |
| commit | 701b5affd403d9a25df311fc422dd33eb4526c34 (patch) | |
| tree | 7e7cc9f57ceb0d3700ee13541944efb044ae9d60 /helpers/lh_chroot_sources | |
| parent | 32930b4a6a14374d2895a4e9247fdc192a91124b (diff) | |
| download | live-build-701b5affd403d9a25df311fc422dd33eb4526c34.zip live-build-701b5affd403d9a25df311fc422dd33eb4526c34.tar.gz | |
For consistency, using true|false instead of enabled|disabled in configuration options.
Diffstat (limited to 'helpers/lh_chroot_sources')
| -rwxr-xr-x | helpers/lh_chroot_sources | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/helpers/lh_chroot_sources b/helpers/lh_chroot_sources index 605dd80..8b3682e 100755 --- a/helpers/lh_chroot_sources +++ b/helpers/lh_chroot_sources @@ -44,18 +44,18 @@ case "${1}" in # Configure custom sources.list echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi - if [ "${LH_SECURITY}" = "enabled" ] + if [ "${LH_SECURITY}" = "true" ] then case "${LH_MODE}" in ubuntu) echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -66,7 +66,7 @@ case "${1}" in then echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -145,7 +145,7 @@ case "${1}" in -o APT::FTPArchive::Release::Origin=chroot_local-packages \ release . > Release" | Chroot chroot sh - if [ "${LH_APT_SECURE}" = "enabled" ] + if [ "${LH_APT_SECURE}" = "true" ] then _LH_DOTGNUPG_EXISTED=0 if [ -d chroot/root/.gnupg ] @@ -234,7 +234,7 @@ case "${1}" in fi # Update indices from cache - if [ "${LH_CACHE_INDICES}" = "enabled" ] && [ -d cache/indices_bootstrap ] + if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ] then if Find_files cache/indices_bootstrap/secring.gpg* then @@ -316,7 +316,7 @@ case "${1}" in Apt update fi - if [ "${LH_CACHE_INDICES}" = "enabled" ] + if [ "${LH_CACHE_INDICES}" = "true" ] then mkdir -p cache/indices_bootstrap @@ -355,7 +355,7 @@ case "${1}" in Create_lockfile .lock # Configure generic indices - if [ "${LH_BINARY_INDICES}" = "enabled" ] + if [ "${LH_BINARY_INDICES}" = "true" ] then # Don't do anything if it's not required if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \ @@ -374,18 +374,18 @@ case "${1}" in echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi - if [ "${LH_SECURITY}" = "enabled" ] + if [ "${LH_SECURITY}" = "true" ] then case "${LH_MODE}" in ubuntu) echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi @@ -396,7 +396,7 @@ case "${1}" in then echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list - if [ "${LH_SOURCE}" = "enabled" ] + if [ "${LH_SOURCE}" = "true" ] then echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi |