Merge dapper special case with libc6-xen into common/20-setup-apt

hooks/common/20-setup-apt

@@ -71,16 +71,18 @@ chroot ${prefix} /usr/bin/apt-get update
 
 
 #
-#  Now fixup TLS on non-64bit systems.
+#  Now fixup TLS on non-64bit systems after dapper.
 #
-if [ "`uname -m`" = "x86_64" ]; then
+if [ "$dist" != 'dapper' ]; then
+    if [ "`uname -m`" = "x86_64" ]; then
 
-    logMessage "Ignoring TLS since we're a 64 bit host."
+	logMessage "Ignoring TLS since we're a 64 bit host."
 
-else
+    else
 
-    logMessage "Installing libc6-xen"
-    installDebianPackage ${prefix} libc6-xen
+	logMessage "Installing libc6-xen"
+	installDebianPackage ${prefix} libc6-xen
+    fi
 fi
 
 

hooks/dapper/20-setup-apt

@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-#  This script sets up the /etc/apt/sources.list for APT.
-#
-# Steve
-# --
-#
-
-
-
-
-prefix=$1
-
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-# Attempt to auto-magically detect the use of a Proxy for apt-get, and
-# replicate that setup in our new guest via apt-config dump and save
-# the setting to the proxy guess file.
-#
-if [ ${apt_proxy} ]; then
-  echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy
-else
-  logMessage The use of a proxy detected.
-  apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy
-fi
-
-
-#
-# Setup the sources.list file for new installations of Ubuntu GNU/Linux.
-#
-cat <<E_O_APT > ${prefix}/etc/apt/sources.list
-#
-#  /etc/apt/sources.list
-#
-
-
-#
-# ${dist}
-#
-deb     ${mirror}     ${dist} main restricted universe multiverse
-deb-src ${mirror}     ${dist} main restricted universe
-deb     ${mirror}     ${dist}-updates main restricted universe multiverse
-deb-src ${mirror}     ${dist}-updates main restricted universe
-deb http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
-deb-src http://security.ubuntu.com/ubuntu ${dist}-security main restricted universe
-
-E_O_APT
-
-
-
-#
-#  Now that the sources have been setup make sure the system is up to date.
-#
-chroot ${prefix} /usr/bin/apt-get update
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/dapper/20-setup-apt

@@ -0,0 +1 @@
+../common/20-setup-apt