Filter out linux-gate.so, which is a pseudo entry for the 32->64bit

translation for amd64 systems, in the initrd creation script.
(Addresses Debian bug #253595)

diff --git a/debian/changelog b/debian/changelog
index 9a9d9981e2849796d098be6b30389610eacbe074..2278134c69397e0886f5264ab51af1b7bf8e55ea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 e2fsprogs (1.35-7) unstable; urgency=low
 
+  * Filter out linux-gate.so, which is a pseudo entry for the 32->64bit
+      translation for amd64 systems, in the initrd creation script.
+      (Closes: #253595)
   * Change the initrd scripts to be use a helper program which avoids
        needing to mount the root filesystem and use awk to query the
        /etc/fstab file.  (Closes: #247775)

diff --git a/debian/initrd-tools.e2fsprogs b/debian/initrd-tools.e2fsprogs
index 80f6fa9d65a2e1f4f32bca056aa29dd9d1a0b016..e514df8cdff39b2925e393cbf37690c3b448c36a 100644 (file)
--- a/debian/initrd-tools.e2fsprogs
+++ b/debian/initrd-tools.e2fsprogs
@@ -14,7 +14,10 @@ case "$VERSION" in
        ;;
 esac
 
-for i in `ldd /sbin/tune2fs /usr/bin/awk | sort -u | awk '{print $3}'` 
+PROGS="/sbin/tune2fs /usr/lib/e2initrd_helper"
+LIBS=`ldd $PROGS | grep -v linux-gate.so | sort -u | \
+    awk '{print $3}'` 
+for i in $LIBS
 do
        mkdir -p `dirname $INITRDDIR/$i`
        cp $i $INITRDDIR/$i