diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-20 22:57:21 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-20 22:57:21 +0000 |
| commit | 099f1b592a9f136c18e0ed4e45e5c046e74c5513 (patch) | |
| tree | ccdf257fdd25e807212208fe740def6af49eaa0e | |
| parent | 32b6f4c4aeddfdda9343d59fba02ae7fe3e0b24c (diff) | |
| download | smartcardauth-099f1b592a9f136c18e0ed4e45e5c046e74c5513.tar.gz smartcardauth-099f1b592a9f136c18e0ed4e45e5c046e74c5513.zip | |
Fix smartauthmon installation failure
Fixm cryptluks initrd setup on multiarch systems
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/smartcardauth@1254703 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rwxr-xr-x | Makefile | 1 | ||||
| -rwxr-xr-x | usr/share/initramfs-tools/hooks/cryptlukssc | 7 |
2 files changed, 7 insertions, 1 deletions
@@ -15,6 +15,7 @@ install: mkdir -p $(DESTDIR)/usr cp -Rp src/ckpasswd usr/bin/smartauthckpasswd + cp -Rp src/smartauthmon usr/bin/smartauthmon cp -Rp usr/* $(DESTDIR)/usr/ mkdir -p $(DESTDIR)/etc diff --git a/usr/share/initramfs-tools/hooks/cryptlukssc b/usr/share/initramfs-tools/hooks/cryptlukssc index aebd75e..6a9c067 100755 --- a/usr/share/initramfs-tools/hooks/cryptlukssc +++ b/usr/share/initramfs-tools/hooks/cryptlukssc @@ -30,7 +30,12 @@ done # pcscd utilizes pthread_cancel mkdir -p ${DESTDIR}/lib copy_exec /usr/sbin/pcscd /sbin -copy_exec /lib/libgcc_s.so.1 /lib +if [ -e /lib/*/libgcc_s.so.1 ] +then + copy_exec /lib/*/libgcc_s.so.1 /lib +else + copy_exec /lib/libgcc_s.so.1 /lib +fi copy_exec /lib/libpcsclite.so.1 /lib cp -r /usr/lib/pcsc ${DESTDIR}/usr/lib cp /etc/reader.conf ${DESTDIR}/etc |