about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-05-16 12:40:27 +0100
committerGitHub <noreply@github.com>2017-05-16 12:40:27 +0100
commit9c3b9264484c90ba7dc46fe9ca0b5f801a401b04 (patch)
tree3f818be91e56d037281623d5d88426b9ab2f77c6 /nixos
parentea2c573b3b6a4c0f498cada3c1756f767162683c (diff)
parenta92bdc54e3d6893f737114c51170b386f8c7672e (diff)
downloadnixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar.gz
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar.bz2
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar.lz
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar.xz
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.tar.zst
nixlib-9c3b9264484c90ba7dc46fe9ca0b5f801a401b04.zip
Merge pull request #25823 from rickynils/luks_crypsetup_quiet
nixos/luks: Silence killall complain about non-existing cryptsetup pr…
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/system/boot/luksroot.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 6e867b674398..59ebb88582ad 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -434,7 +434,7 @@ in
       #!$out/bin/sh -e
       if [ -e /.luksopen_args ]; then
         cryptsetup \$(cat /.luksopen_args)
-        killall cryptsetup
+        killall -q cryptsetup
       else
         echo "Passphrase is not requested now"
         exit 1