summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e>2006-08-02 21:15:19 +0000
committerjonas <jonas@8f53b18a-e215-0410-8885-9f593d34873e>2006-08-02 21:15:19 +0000
commit7b9b9d8c5d450f00c686d059ebe76e7d313a4e41 (patch)
tree5c5bafd0eaf95ab02e0ffbc5582cff9eb8cb6584
parentdee795e086230f6b7b39f1f2487792ab1fe8912b (diff)
Pass --allow-unauthenticated only to recent releases of apt-get.
git-svn-id: svn+ssh://xayide/home/jonas/private_svn/fleshybrid/homebase@26 8f53b18a-e215-0410-8885-9f593d34873e
-rwxr-xr-x1_makerootfs.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/1_makerootfs.sh b/1_makerootfs.sh
index 02f5e0a..82291b4 100755
--- a/1_makerootfs.sh
+++ b/1_makerootfs.sh
@@ -77,7 +77,14 @@ case "$debootstrap" in
;;
cdebootstrap)
./chroot.sh temp apt-get update
- ./chroot.sh temp apt-get -y --allow-unauthenticated install aptitude
+ case "$suite" in
+ etch|sid)
+ ./chroot.sh temp apt-get -y --allow-unauthenticated install aptitude
+ ;;
+ *)
+ ./chroot.sh temp apt-get -y install aptitude
+ ;;
+ esac
./chroot.sh temp aptitude -y purge cdebootstrap-helper-diverts
# Hmm - this next one seems like a bug!
rm -rf "$targettemp/var/cache/debootstrap"