summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-03-16 12:14:55 (GMT)
committerColin Watson <cjwatson@debian.org>2009-03-16 12:14:55 (GMT)
commit253678c4ffcda3ef52f6ec3d3037685004f79aa7 (patch)
tree0fa93400c48253d11672206f6d21671f60196e17 /scripts
parent21ea52186c5e6a8c9b7760306532aae3e3de7c2f (diff)
downloaddebootstrap-253678c4ffcda3ef52f6ec3d3037685004f79aa7.zip
debootstrap-253678c4ffcda3ef52f6ec3d3037685004f79aa7.tar.gz
debootstrap-253678c4ffcda3ef52f6ec3d3037685004f79aa7.tar.bz2
match libc changes for Ubuntu
r57841
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ubuntu/breezy8
-rw-r--r--scripts/ubuntu/dapper8
-rw-r--r--scripts/ubuntu/edgy8
-rw-r--r--scripts/ubuntu/feisty8
-rw-r--r--scripts/ubuntu/gutsy8
-rw-r--r--scripts/ubuntu/hoary8
6 files changed, 24 insertions, 24 deletions
diff --git a/scripts/ubuntu/breezy b/scripts/ubuntu/breezy
index f8d1083..f445598 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/ubuntu/breezy
@@ -4,10 +4,10 @@ download_style apt
finddebs_style from-indices
variants - buildd
-LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
diff --git a/scripts/ubuntu/dapper b/scripts/ubuntu/dapper
index a9a2d6d..7f88d55 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/ubuntu/dapper
@@ -11,10 +11,10 @@ download_style apt
finddebs_style from-indices
variants - buildd
-LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
diff --git a/scripts/ubuntu/edgy b/scripts/ubuntu/edgy
index 72ebc9b..0dbc5dc 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/ubuntu/edgy
@@ -15,10 +15,10 @@ if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi
-LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
diff --git a/scripts/ubuntu/feisty b/scripts/ubuntu/feisty
index 360607b..4036828 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/ubuntu/feisty
@@ -15,10 +15,10 @@ if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi
-LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index 6c09e53..caca1f8 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -15,10 +15,10 @@ if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi
-LIBC=libc6
-if [ "$ARCH" = "alpha" ] || [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ alpha|ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {
required="$(get_debs Priority: required)"
diff --git a/scripts/ubuntu/hoary b/scripts/ubuntu/hoary
index 9c9316c..7944999 100644
--- a/scripts/ubuntu/hoary
+++ b/scripts/ubuntu/hoary
@@ -2,10 +2,10 @@ default_mirror http://old-releases.ubuntu.com/ubuntu
mirror_style release
download_style apt
-LIBC=libc6
-if [ "$ARCH" = "ia64" ]; then
- LIBC="libc6.1"
-fi
+case $ARCH in
+ ia64) LIBC="libc6.1" ;;
+ *) LIBC="libc6" ;;
+esac
work_out_debs () {