From db77d621e7819bed675284da737926ed94ee8978 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Mon, 4 Jun 2012 18:30:54 +0200 Subject: [PATCH] hooks/debian/20-setup-apt: Use blacklist for libc6-xen instead of whitelist --- debian/changelog | 2 ++ hooks/debian/20-setup-apt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 579d5f7..858d793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ xen-tools (4.3~dev-1) UNRELEASED; urgency=low - Also disable initctl in the chroot, not only start-stop-daemon (LP: #997063; Thanks xstasi!) - Massive code deduplication in hooks directory + - Use release blacklist for libc6-xen instead of whitelist in + hooks/debian.d/20-setup-apt * Add dependency on openssh-client for ssh-keygen (Closes: #649108) * Use dh_auto_test for build time tests and add according build-dependencies on devscripts and libfile-slurp-perl. diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt index b325602..65b3590 100755 --- a/hooks/debian/20-setup-apt +++ b/hooks/debian/20-setup-apt @@ -104,12 +104,12 @@ if [ "`uname -m`" = "x86_64" ]; then else case "${dist}" in - etch|lenny|sid) + *) logMessage "Installing xen-aware libc6" installDebianPackage ${prefix} libc6-xen ;; - *) + sarge) logMessage "Disabling TLS" mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled mkdir ${prefix}/lib/tls