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: bb15fa742780
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e54cd0ef252f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 15, 2020

  1. nixos/lvm2-activation-generator: fix warnings on activation

    @Mic92
    Mic92 committed Nov 15, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8ac3a15 View commit details

Commits on Nov 16, 2020

  1. Merge pull request #103876 from Mic92/lvm-generator-fix 

    nixos/lvm2-activation-generator: fix warnings on activation
    @Mic92
    Mic92 authored Nov 16, 2020
    Copy the full SHA
    e54cd0e View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 nixos/modules/tasks/lvm.nix
4 changes: 4 additions & 0 deletions nixos/modules/tasks/lvm.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,10 @@ in {
};

config = mkMerge [
({
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
environment.etc."lvm/lvm.conf".text = "config {}";
})
(mkIf (!config.boot.isContainer) {
systemd.tmpfiles.packages = [ cfg.package.out ];
environment.systemPackages = [ cfg.package ];