summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-20 23:47:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-20 23:47:48 +0000
commitfcf6f563164c7349d47bcbfd579464d6542bca52 (patch)
tree12346ac003d8bfb438e26b1726251c190f8853c6
parent805920ff321ecf12fcc8d68377797a806dbd491e (diff)
downloadsmartcardauth-fcf6f563164c7349d47bcbfd579464d6542bca52.tar.gz
smartcardauth-fcf6f563164c7349d47bcbfd579464d6542bca52.zip
Fix smartcardauth initramfs with new pcscd
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/smartcardauth@1254707 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rwxr-xr-xusr/share/initramfs-tools/hooks/cryptlukssc7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/share/initramfs-tools/hooks/cryptlukssc b/usr/share/initramfs-tools/hooks/cryptlukssc
index 6a9c067..8dc14ab 100755
--- a/usr/share/initramfs-tools/hooks/cryptlukssc
+++ b/usr/share/initramfs-tools/hooks/cryptlukssc
@@ -38,7 +38,12 @@ else
fi
copy_exec /lib/libpcsclite.so.1 /lib
cp -r /usr/lib/pcsc ${DESTDIR}/usr/lib
-cp /etc/reader.conf ${DESTDIR}/etc
+if [ -e /etc/reader.conf.d ]
+then
+ cp -Rp /etc/reader.conf.d ${DESTDIR}/etc/
+else
+ cp /etc/reader.conf ${DESTDIR}/etc
+fi
# Install opensc commands and conf file
copy_exec /usr/bin/opensc-tool /bin