suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Cosmetic change to yubikey detection

Browse Source
This commit is contained in:
Moritz Maxeiner 2014-01-28 20:39:25 +01:00
parent 407a770161
commit 45b1ffb8db
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/modules/system/boot/luksroot.nix
View File

@ -148,21 +148,25 @@ let
umount ${yubikey.storage.mountPoint} umount ${yubikey.storage.mountPoint}
} }
ykinfo -v yubikey_missing=true
yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?" ykinfo -v 1>/dev/null 2>&1
if [ "$yubikey_missing" != "0" ]; then if [ $? != "0" ]; then
echo -n "waiting 10 seconds for yubikey to appear..." echo -n "waiting 10 seconds for yubikey to appear..."
for try in $(seq 10); do for try in $(seq 10); do
sleep 1 sleep 1
ykinfo -v ykinfo -v 1>/dev/null 2>&1
yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?" if [ $? == "0" ]; then
if [ "$yubikey_missing" == "0" ]; then break; fi yubikey_missing=false
break
fi
echo -n . echo -n .
done done
echo "ok" echo "ok"
else
yubikey_missing=false
fi fi
if [ "$yubikey_missing" != "0" ]; then if [ "$yubikey_missing" == true ]; then
echo "no yubikey found, falling back to non-yubikey open procedure" echo "no yubikey found, falling back to non-yubikey open procedure"
open_normally open_normally
else else