From 9121392d25e59d4aad5477321b2c7824b5a6ac6a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 14 May 2012 18:31:04 -0500 Subject: [PATCH] Fix initramfs hook problems on multiarch (cherry picked from commit 602e262c44fcbc09b4d9e3b79b76859f06482efc) --- usr/share/initramfs-tools/hooks/cryptlukssc | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/usr/share/initramfs-tools/hooks/cryptlukssc b/usr/share/initramfs-tools/hooks/cryptlukssc index a960f0f..0795102 100755 --- a/usr/share/initramfs-tools/hooks/cryptlukssc +++ b/usr/share/initramfs-tools/hooks/cryptlukssc @@ -36,8 +36,18 @@ then else copy_exec /lib/libgcc_s.so.1 /lib fi -copy_exec /lib/libpcsclite.so.1 /lib -copy_exec /usr/lib/libusb-1.0.so.0 /usr/lib +if [ -e /lib/*/libpcsclite.so.1 ] +then + copy_exec /lib/*/libpcsclite.so.1 /lib +else + copy_exec /lib/libpcsclite.so.1 /lib +fi +if [ -e /usr/lib/*/libusb-1.0.so.0 ] +then + copy_exec /usr/lib/*/libusb-1.0.so.0 /usr/lib +else + copy_exec /usr/lib/libusb-1.0.so.0 /usr/lib +fi cp -r /usr/lib/pcsc ${DESTDIR}/usr/lib if [ -e /etc/reader.conf.d ] then @@ -73,4 +83,9 @@ copy_exec /usr/bin/smartauth.sh /bin # Libraries # cp /usr/lib/libltdl.so* ${DESTDIR}/usr/lib # cp /lib/libncurses.so.5 ${DESTDIR}/lib -cp /lib/libncursesw.so.5 ${DESTDIR}/lib +if [ -e /lib/*/libncursesw.so.5 ] +then + cp /lib/*/libncursesw.so.5 ${DESTDIR}/lib +else + cp /lib/libncursesw.so.5 ${DESTDIR}/lib +fi