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
base: 8c025c67d5a1
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 27c6bf0ef377
Choose a head ref
  • 7 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 8, 2018

  1. nixos: boot/stage-1: check syntax of the generated script

    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    dc65344 View commit details
    Browse the repository at this point in the history

  2. nixos: initrd/luks: cleanup and generalize common shell expressions 

    Also fix Yubikey timeout handling mess.
    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    12e6907 View commit details
    Browse the repository at this point in the history

  3. nixos: initrd/luks: change passphrases handling 

    Also reuse common cryptsetup invocation subexpressions.

- Passphrase reading is done via the shell now, not by cryptsetup.
  This way the same passphrase can be reused between cryptsetup
  invocations, which this module now tries to do by default (can be
  disabled).
- Number of retries is now infinity, it makes no sense to make users
  reboot when they fail to type in their passphrase.
    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    a9d69a7 View commit details
    Browse the repository at this point in the history

  4. nixos: initrd/luks: simplify Yubikey handling code 

    From reading the source I'm pretty sure it doesn't support multiple Yubikeys, hence
those options are useless.

Also, I'm pretty sure nobody actually uses this feature, because enabling it causes
extra utils' checks to fail (even before applying any patches of this branch).

As I don't have the hardware to test this, I'm too lazy to fix the utils, but
I did test that with extra utils checks commented out and Yubikey
enabled the resulting script still passes the syntax check.
    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    c35917e View commit details
    Browse the repository at this point in the history

  5. nixos: initrd/luks: disable input echo for the whole stage

    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    8c83ba0 View commit details
    Browse the repository at this point in the history

  6. doc: document luksroot.nix changes in release notes

    @oxij
    oxij committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    456f97f View commit details
    Browse the repository at this point in the history

  7. Merge pull request #29441 from oxij/nixos/luks 

    nixos: initrd/luks: allow to reuse passphrases, cleanup
    @samueldr
    samueldr committed Aug 8, 2018
    Configuration menu
    Copy the full SHA
    27c6bf0 View commit details
    Browse the repository at this point in the history