summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-03-21 22:51:15 +0100
committerDaniel Baumann <daniel@debian.org>2008-03-21 22:51:15 +0100
commit92edfe399bae94b9e2545f62e14d0bcccb310e8c (patch)
tree7ed34bd9e5214560c84922e6a6948fd2a7e00002
parentfb89c5ada9741caed8033a879f379897a7700e42 (diff)
downloadvyos-live-build-92edfe399bae94b9e2545f62e14d0bcccb310e8c.tar.gz
vyos-live-build-92edfe399bae94b9e2545f62e14d0bcccb310e8c.zip
Switching default of LH_APT from aptitude to apt for >= lenny.
Apt in lenny also supports tracking of 'orphaned' packages. If aptitude is installed, apt can't be removed, so by switching to apt making the default images a tiny bit smaller. And, aptitude got mainly default because of the sarge->etch update recommendation.
-rwxr-xr-xfunctions/defaults.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ddaf9a7c9..70aa6f293 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -34,7 +34,12 @@ Set_defaults ()
fi
# Setting package manager
- LH_APT="${LH_APT:-aptitude}"
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
+ then
+ LH_APT="${LH_APT:-aptitude}"
+ else
+ LH_APT="${LH_APT:-apt}"
+ fi
# Setting apt ftp proxy
if [ -z "${LH_APT_FTP_PROXY}" ] && [ -n "${ftp_proxy}" ]