Unverified Commit 3865eb52 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #142369 from helsinki-systems/upd/lvm2 

lvm2: 2.03.12 -> 2.03.14
parents c6f07eae a43c2c1e

nixos/tests/installer.nix

+0 −10
Original line number Diff line number Diff line
@@ -561,26 +561,16 @@ in { 
          + " mkpart primary 2048M -1s"  # PV2

          + " set 2 lvm on",

          "udevadm settle",

          "sleep 1",

          "pvcreate /dev/vda1 /dev/vda2",

          "sleep 1",

          "vgcreate MyVolGroup /dev/vda1 /dev/vda2",

          "sleep 1",

          "lvcreate --size 1G --name swap MyVolGroup",

          "sleep 1",

          "lvcreate --size 3G --name nixos MyVolGroup",

          "sleep 1",

          "mkswap -f /dev/MyVolGroup/swap -L swap",

          "swapon -L swap",

          "mkfs.xfs -L nixos /dev/MyVolGroup/nixos",

          "mount LABEL=nixos /mnt",

      )

    '';

    postBootCommands = ''

      assert "loaded active" in machine.succeed(

          "systemctl list-units 'lvm2-pvscan@*' -ql --no-legend | tee /dev/stderr"

      )

    '';

  };



  # Boot off an encrypted root partition with the default LUKS header format

pkgs/os-specific/linux/lvm2/2_02.nix

+1 −1
Original line number Diff line number Diff line 
import ./common.nix {

  version = "2.02.187";

  sha256Hash = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE=";

  sha256 = "sha256-Dg1SGoY6XbJEDy4edie6grcCc65KsLvhMIUdsNWOWvE=";

}

pkgs/os-specific/linux/lvm2/2_03.nix

+2 −2
Original line number Diff line number Diff line 
import ./common.nix {

  version = "2.03.12";

  sha256Hash = "1shczwfd0888dchjiaqzd48ampm6f8y0ngsqd99fy4nxlbr5q1vn";

  version = "2.03.14";

  sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa";

}

pkgs/os-specific/linux/lvm2/common.nix

+4 −4
Original line number Diff line number Diff line 
{ version, sha256Hash }:

{ version, sha256 }:



{ lib, stdenv

, fetchpatch
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 


  src = fetchurl {

    url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz";

    sha256 = sha256Hash;

    inherit sha256;

  };



  nativeBuildInputs = [ pkg-config ];
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec { 
    substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \

      --replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm

    # https://github.com/lvmteam/lvm2/issues/36

    substituteInPlace udev/69-dm-lvm-metad.rules.in \

      --replace "(BINDIR)/systemd-run" /run/current-system/systemd/bin/systemd-run

    substituteInPlace udev/69-dm-lvm.rules.in \

      --replace "/usr/bin/systemd-run" /run/current-system/systemd/bin/systemd-run



    substituteInPlace make.tmpl.in --replace "@systemdsystemunitdir@" "$out/lib/systemd/system"

  '' + lib.optionalString (lib.versionAtLeast version "2.03") ''