From 0d1e1b7e2a0134299a486f393c3a6cde0f0a5684 Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 4 Jun 2012 18:19:26 +0200
Subject: [PATCH] Merge common/10-disable-tls and dapper/10-disable-tls

---
 hooks/common/10-disable-tls | 14 +++++------
 hooks/dapper/10-disable-tls | 49 +------------------------------------
 2 files changed, 8 insertions(+), 55 deletions(-)
 mode change 100755 => 120000 hooks/dapper/10-disable-tls

diff --git a/hooks/common/10-disable-tls b/hooks/common/10-disable-tls
index a80edd6..aa3dc7f 100755
--- a/hooks/common/10-disable-tls
+++ b/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
diff --git a/hooks/dapper/10-disable-tls b/hooks/dapper/10-disable-tls
deleted file mode 100755
index dc6da15..0000000
--- a/hooks/dapper/10-disable-tls
+++ /dev/null
@@ -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
diff --git a/hooks/dapper/10-disable-tls b/hooks/dapper/10-disable-tls
new file mode 120000
index 0000000..9ae8088
--- /dev/null
+++ b/hooks/dapper/10-disable-tls
@@ -0,0 +1 @@
+../common/10-disable-tls
\ No newline at end of file