Merge common/10-disable-tls and dapper/10-disable-tls

hooks/common/10-disable-tls

@@ -31,17 +31,17 @@ logMessage Script $0 starting
 # Don't touch TLS on 64 bit platforms.
 #
 if [ "`uname -m`" = "x86_64" ]; then
+
     logMessage "Ignoring TLS since we're a 64 bit host."
-    exit
+
+else
+
+    logMessage "Disabling TLS"
+    mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
+    mkdir ${prefix}/lib/tls
 fi
 
 
-#
-# Disable TLS and create an empty directory in its place
-# 
-mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-mkdir ${prefix}/lib/tls
-
 
 #
 #  Log our finish

hooks/dapper/10-disable-tls

@@ -1,48 +0,0 @@
-#!/bin/sh
-#
-#  This script disables TLS
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-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
-
-
-#
-# Ignore tls on 64 bit machines.
-#
-if [ "`uname -m`" = "x86_64" ]; then
-
-    logMessage "Ignoring TLS since we're a 64 bit host."
-
-else
-
-    logMessage "Disabling TLS"
-    mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
-    mkdir ${prefix}/lib/tls
-fi
-
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/dapper/10-disable-tls

@@ -0,0 +1 @@
+../common/10-disable-tls