diff options
| author | Moritz Maxeiner <moritz@ucworks.org> | 2014-01-28 20:39:25 +0100 |
|---|---|---|
| committer | Moritz Maxeiner <moritz@ucworks.org> | 2014-01-28 20:39:46 +0100 |
| commit | 45b1ffb8dba869b48b51daf72db5f73c960dd8f3 (patch) | |
| tree | e81154a5c65fdaa3d23202960379766cfef09405 /nixos | |
| parent | 407a77016162958c743bbf354465e0396c32ecc0 (diff) | |
| download | nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar.gz nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar.bz2 nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar.lz nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar.xz nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.tar.zst nixlib-45b1ffb8dba869b48b51daf72db5f73c960dd8f3.zip | |
Cosmetic change to yubikey detection
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 52c91a0e20ce..46cd96e01674 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -148,21 +148,25 @@ let umount ${yubikey.storage.mountPoint} } - ykinfo -v - yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?" - if [ "$yubikey_missing" != "0" ]; then + yubikey_missing=true + ykinfo -v 1>/dev/null 2>&1 + if [ $? != "0" ]; then echo -n "waiting 10 seconds for yubikey to appear..." for try in $(seq 10); do sleep 1 - ykinfo -v - yubikey_missing="$(ykinfo -v 1>/dev/null 2>&1)$?" - if [ "$yubikey_missing" == "0" ]; then break; fi + ykinfo -v 1>/dev/null 2>&1 + if [ $? == "0" ]; then + yubikey_missing=false + break + fi echo -n . done echo "ok" + else + yubikey_missing=false fi - if [ "$yubikey_missing" != "0" ]; then + if [ "$yubikey_missing" == true ]; then echo "no yubikey found, falling back to non-yubikey open procedure" open_normally else |