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: 9f911ab1b588
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8e0b2b91772c
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Aug 4, 2020

  1. systemd: build with cryptsetup and cryptsetup-generators

    There's a circular dependency to systemd via cryptsetup and lvm2
    (systemd -> cryptsetup -> lvm2 -> udev=systemd).
    
    However, cryptsetup only really needs the devmapper component shipped
    with lvm2. So build `pkgs.cryptsetup` with a lvm2 that doesn't come with
    udev.
    flokli committed Aug 4, 2020
    Copy the full SHA
    72c8ed0 View commit details
    Browse the repository at this point in the history
  2. systemd: substituteInPlace paths to mkswap and mke2fs (used in new cr…

    …yptsetup-generator.c)
    flokli committed Aug 4, 2020
    Copy the full SHA
    0a41d69 View commit details
    Browse the repository at this point in the history
  3. systemd-cryptsetup-generator: remove

    This package previously did override the systemd package, and instructed
    ninja, systemd's previous build system, to only build the
    cryptsetup-specific systemd generators (plus some manual rpath
    massaging, as ninja install wasn't used).
    
    Afterwards, users were expected to add this package to their
    `systemd.generator-packages` (or since
    https://github.com/NixOS/nixpkgs/pull/65376/files `systemd.packages`)
    NixOS module options, so systemd will use these generators.
    
    As the previous commit added cryptsetup support directly to the systemd
    package (and pkgs.systemd now already ships the cryptsetup generators),
    we don't need another package shipping the same generators.
    arianvp authored and flokli committed Aug 4, 2020
    Copy the full SHA
    29941db View commit details
    Browse the repository at this point in the history
  4. nixosTests.systemd: test cryptsetup support

    This creates and opens a luks volume, puts its passphrase into a keyfile
    and writes a /etc/crypttab. It then reboots the machine, and verifies
    systemd parsed /etc/crypttab properly, and was able to unlock the volume
    with the keyfile provided (as we try to mount it).
    
    The memorySize of the VM had to be bumped, as luksFormat would otherwise
    run out of memory.
    flokli committed Aug 4, 2020
    Copy the full SHA
    eb58711 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2020

  1. Merge pull request #66856 from flokli/systemd-cryptsetup-lvm

    systemd: build with cryptsetup support, add cryptsetup generators
    flokli committed Aug 6, 2020
    1
    Copy the full SHA
    8e0b2b9 View commit details
    Browse the repository at this point in the history