commit 9c3b9264484c90ba7dc46fe9ca0b5f801a401b04 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #25823 from rickynils/luks_crypsetup_quiet

nixos/luks: Silence killall complain about non-existing cryptsetup pr…

Jörg Thalheim 8 years ago 9c3b9264 ea2c573b

options

unified split

Changed files

+1 -1

nixos

modules

system

boot

luksroot.nix

+1 -1

nixos/modules/system/boot/luksroot.nix

···

       434
        
             #!$out/bin/sh -e

     

       435
        
             if [ -e /.luksopen_args ]; then

     

       436
        
               cryptsetup \$(cat /.luksopen_args)

     

       437
       -
               killall cryptsetup

     

       438
        
             else

     

       439
        
               echo "Passphrase is not requested now"

     

       440
        
               exit 1

···

       434
        
             #!$out/bin/sh -e

     

       435
        
             if [ -e /.luksopen_args ]; then

     

       436
        
               cryptsetup \$(cat /.luksopen_args)

     

       437
       +
               killall -q cryptsetup

     

       438
        
             else

     

       439
        
               echo "Passphrase is not requested now"

     

       440
        
               exit 1