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_apt | |
| parent | 32930b4a6a14374d2895a4e9247fdc192a91124b (diff) | |
| download | vyos-live-build-701b5affd403d9a25df311fc422dd33eb4526c34.tar.gz vyos-live-build-701b5affd403d9a25df311fc422dd33eb4526c34.zip | |
For consistency, using true|false instead of enabled|disabled in configuration options.
Diffstat (limited to 'helpers/lh_chroot_apt')
| -rwxr-xr-x | helpers/lh_chroot_apt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/helpers/lh_chroot_apt b/helpers/lh_chroot_apt index 4396aebaa..6836c2d75 100755 --- a/helpers/lh_chroot_apt +++ b/helpers/lh_chroot_apt @@ -55,11 +55,11 @@ case "${1}" in # Configuring apt pdiffs case "${LH_APT_PDIFFS}" in - enabled) + true) echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs ;; - disabled) + false) echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs ;; esac @@ -72,12 +72,12 @@ case "${1}" in # Configuring apt recommends case "${LH_APT_RECOMMENDS}" in - enabled) + true) echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends ;; - disabled) + false) echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends ;; @@ -85,12 +85,12 @@ case "${1}" in # Configuring apt secure case "${LH_APT_SECURE}" in - enabled) + true) echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure ;; - disabled) + false) echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure ;; @@ -163,7 +163,7 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00http-proxy # Deconfiguring aptitude pdiffs - if [ "${LH_APT_PDIFFS}" = "enabled" ] + if [ "${LH_APT_PDIFFS}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00pdiffs fi @@ -172,13 +172,13 @@ case "${1}" in rm -f chroot/etc/apt/apt.conf.d/00pipeline # Deconfiguring aptitude recommends - if [ "${LH_APT_RECOMMENDS}" = "enabled" ] + if [ "${LH_APT_RECOMMENDS}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00recommends fi # Deconfiguring aptitude secure - if [ "${LH_APT_SECURE}" = "enabled" ] + if [ "${LH_APT_SECURE}" = "true" ] then rm -f chroot/etc/apt/apt.conf.d/00secure fi |