From 45b1ffb8dba869b48b51daf72db5f73c960dd8f3 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <moritz@ucworks.org>
Date: Tue, 28 Jan 2014 20:39:25 +0100
Subject: [PATCH] Cosmetic change to yubikey detection

---
 nixos/modules/system/boot/luksroot.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 52c91a0e20c..46cd96e0167 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