mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
Merge master into staging-next
This commit is contained in:
commit
74a6c68160
121 changed files with 955 additions and 661 deletions
|
@ -185,6 +185,10 @@ let
|
|||
echo "reused"
|
||||
passphrase=$(cat /crypt-ramfs/passphrase)
|
||||
break
|
||||
elif [ -e /dev/mapper/${dev.name} ]; then
|
||||
echo "opened externally"
|
||||
rm -f /crypt-ramfs/device
|
||||
return
|
||||
else
|
||||
# ask cryptsetup-askpass
|
||||
echo -n "${dev.device}" > /crypt-ramfs/device
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue