2006-10-14 17:04:40 by steve
Updated the handling of /lib/tls to only disable it on Sarge installs. Use libc6-xen elsewhere if available. TODO: Fix ubuntu installation types.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# This script disables TLS on the new image.
|
||||
# This script disables TLS on the new image or installs a Xen-aware
|
||||
# version of libc where it is available.
|
||||
#
|
||||
# Steve
|
||||
# --
|
||||
@@ -26,20 +27,23 @@ logMessage Script $0 starting
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Disable TLS and create an empty directory in its place
|
||||
#
|
||||
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
|
||||
mkdir ${prefix}/lib/tls
|
||||
|
||||
|
||||
#
|
||||
# For sid + etch systems install libc6-xen
|
||||
# For sid or etch systems we install libc6-xen
|
||||
#
|
||||
# For sarge we don't have that option, so we disable TLS.
|
||||
#
|
||||
case "${dist}" in
|
||||
etch|sid)
|
||||
logMessage "Installing xen-aware libc6"
|
||||
|
||||
installDebianPackage ${prefix} libc6-xen
|
||||
;;
|
||||
*)
|
||||
logMessage "Disabling TLS"
|
||||
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
|
||||
mkdir ${prefix}/lib/tls
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# This script disables TLS on the new image.
|
||||
# This script disables TLS on the new image or installs a Xen-aware
|
||||
# version of libc where it is available.
|
||||
#
|
||||
# --
|
||||
# TODO: Get an Ubuntu user to explain Dapper/Edgey stuff to me, we
|
||||
# should fix this script to work with libc6-xen there too ..
|
||||
# --
|
||||
#
|
||||
# Steve
|
||||
# --
|
||||
@@ -26,20 +32,23 @@ logMessage Script $0 starting
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Disable TLS and create an empty directory in its place
|
||||
#
|
||||
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
|
||||
mkdir ${prefix}/lib/tls
|
||||
|
||||
|
||||
#
|
||||
# For sid + etch systems install libc6-xen
|
||||
# For sid or etch systems we install libc6-xen
|
||||
#
|
||||
# For sarge we don't have that option, so we disable TLS.
|
||||
#
|
||||
case "${dist}" in
|
||||
etch|sid)
|
||||
logMessage "Installing xen-aware libc6"
|
||||
|
||||
installDebianPackage ${prefix} libc6-xen
|
||||
;;
|
||||
*)
|
||||
logMessage "Disabling TLS"
|
||||
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled
|
||||
mkdir ${prefix}/lib/tls
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user