summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2007-07-04 00:49:14 +0200
committermaximilian attems <maks@debian.org>2007-07-04 00:49:14 +0200
commit02b76d4d71a6e5c9cae1c0acaba281e3def583e0 (patch)
tree33d785ea6f1ad69035a76491bb0222f336157b61
parent5ac61dd320ed9616a7e986fa824f804dbbd626af (diff)
downloadinitramfs-tools-02b76d4d71a6e5c9cae1c0acaba281e3def583e0.tar.gz
initramfs-tools-02b76d4d71a6e5c9cae1c0acaba281e3def583e0.zip
hook-functions: fix Xen boot
-rw-r--r--debian/changelog7
-rw-r--r--hook-functions2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3141edf..bf883bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+initramfs-tools (0.90) UNRELEASED; urgency=low
+
+ * hook-functions: Fix xen i386 boots with optimized 2.5. (closes: 420754)
+ Thanks Marco Nenciarini <mnencia@debian.org> for patch.
+
+ -- maximilian attems <maks@debian.org> Wed, 04 Jul 2007 00:45:20 +0200
+
initramfs-tools (0.89) unstable; urgency=low
Release "L'électeur c'est notoire N'a pas tout' sa raison"
diff --git a/hook-functions b/hook-functions
index a133a0b..131f132 100644
--- a/hook-functions
+++ b/hook-functions
@@ -147,7 +147,7 @@ copy_exec() {
# Try to use non-optimised libraries where possible.
# We assume that all HWCAP libraries will be in tls.
- nonoptlib=$(echo "${x}" | sed -e 's#/lib/tls.*/\(lib.*\)#/lib/\1#')
+ nonoptlib=$(echo "${x}" | sed -e 's#/lib/\(tls\|i686\).*/\(lib.*\)#/lib/\2#')
if [ -e "${nonoptlib}" ]; then
x="${nonoptlib}"