Pārlūkot izejas kodu

finetune smartcard support

Waldemar Brodkorb 13 gadi atpakaļ
vecāks
revīzija
e7d2b2e754
2 mainītis faili ar 5 papildinājumiem un 3 dzēšanām
  1. 3 3
      package/cryptinit/src/cryptinitsc
  2. 2 0
      package/openct/Makefile

+ 3 - 3
package/cryptinit/src/cryptinitsc

@@ -26,7 +26,7 @@ done
 mount /dev/sda1 /boot
 mkdir -p /var/run/openct
 openct-control init
-pcscd -f &
+pcscd -f >/dev/null &
 sleep 2
 
 fail=0
@@ -57,9 +57,9 @@ echo "254:0" > /sys/power/resume
 cryptsetup -d /tmp/skey --batch-mode luksOpen $root rootcrypt
 swapon /dev/mapper/swapcrypt
 mount /dev/mapper/rootcrypt /mnt
+pkill pcscd
+rm /tmp/skey
 umount /proc
 umount /sys
 umount /dev/pts
-rm /tmp/skey
-pkill pcscd
 umount /tmp

+ 2 - 0
package/openct/Makefile

@@ -37,6 +37,8 @@ post-install:
 		${IDIR_OPENCT}/usr/bin
 	${INSTALL_DATA} ${WRKBUILD}/etc/openct.conf \
 		${IDIR_OPENCT}/etc
+
+libopenct-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENCT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libopenct.so* \
 		${IDIR_LIBOPENCT}/usr/lib