public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos: initrd/luks: make script indentation consistent

Browse Source
This commit is contained in:
Ben Wolsieffer 2018-10-11 15:52:11 -04:00
parent dd428b8f5f
commit 264cb7407c
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,19 +7,19 @@ let
commonFunctions = '' commonFunctions = ''
die() { die() {
echo "$@" >&2 echo "$@" >&2
exit 1 exit 1
} }
dev_exist() { dev_exist() {
local target="$1" local target="$1"
if [ -e $target ]; then if [ -e $target ]; then
return 0 return 0
else else
local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g') local uuid=$(echo -n $target | sed -e 's,UUID=\(.*\),\1,g')
local dev=$(blkid --uuid $uuid) local dev=$(blkid --uuid $uuid)
return $? return $?
fi fi
} }
wait_target() { wait_target() {
@ -51,30 +51,30 @@ let
} }
wait_yubikey() { wait_yubikey() {
local secs="''${1:-10}" local secs="''${1:-10}"
ykinfo -v 1>/dev/null 2>&1 ykinfo -v 1>/dev/null 2>&1
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo -n "Waiting $secs seconds for Yubikey to appear..." echo -n "Waiting $secs seconds for Yubikey to appear..."
local success=false local success=false
for try in $(seq $secs); do for try in $(seq $secs); do
echo -n . echo -n .
sleep 1 sleep 1
ykinfo -v 1>/dev/null 2>&1 ykinfo -v 1>/dev/null 2>&1
if [ $? == 0 ]; then if [ $? == 0 ]; then
success=true success=true
break break
fi fi
done done
if [ $success == true ]; then if [ $success == true ]; then
echo " - success"; echo " - success";
return 0 return 0
else else
echo " - failure"; echo " - failure";
return 1 return 1
fi fi
fi fi
return 0 return 0
} }
''; '';