summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-14 18:31:04 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-14 18:31:04 -0500
commit602e262c44fcbc09b4d9e3b79b76859f06482efc (patch)
tree64bdd7996d10a9a0cb84059becd5ffa6300e9058
parentb40e2b25ecb5a9d582e036b8460a664e13cac5c0 (diff)
downloadsmartcardauth-602e262c44fcbc09b4d9e3b79b76859f06482efc.tar.gz
smartcardauth-602e262c44fcbc09b4d9e3b79b76859f06482efc.zip
Fix initramfs hook problems on multiarch
-rwxr-xr-xusr/share/initramfs-tools/hooks/cryptlukssc21
1 files 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