Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea2c573b3b6a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c3b9264484c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 16, 2017

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

    …ocesses
    @rickynils
    rickynils committed May 16, 2017
    Copy the full SHA
    a92bdc5 View commit details

  2. Merge pull request #25823 from rickynils/luks_crypsetup_quiet 

    nixos/luks: Silence killall complain about non-existing cryptsetup pr…
    @Mic92
    Mic92 authored May 16, 2017
    Copy the full SHA
    9c3b926 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/system/boot/luksroot.nix
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/luksroot.nix
View file
Original file line number Diff line number Diff line change
@@ -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