b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #182204 from helsinki-systems/upd/vdo

Browse source 
(k)vdo: 8.1.1.360 -> 8.2.0.2
This commit is contained in:
Lassulus 2022-07-21 21:46:27 +02:00 committed by GitHub
parent e2b34f0f11 c386f8658b
commit bcd7e09db0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/tasks/lvm.nix
View file

@ -85,13 +85,15 @@ in {
systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ];
extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable)''
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
ls ${pkgs.vdo}/bin/ | while read BIN; do
copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
done
substituteInPlace $out/bin/vdorecover --replace "${pkgs.bash}/bin/bash" "/bin/sh"
substituteInPlace $out/bin/adaptLVMVDO.sh --replace "${pkgs.bash}/bin/bash" "/bin/sh"
'';
extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)''
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
ls ${pkgs.vdo}/bin/ | grep -vE '(adaptLVMVDO|vdorecover)' | while read BIN; do
$out/bin/$(basename $BIN) --help > /dev/null
done
'';

2
pkgs/os-specific/linux/kvdo/default.nix
View file

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "dm-vdo";
repo = "kvdo";
rev = version;
sha256 = "1xl7dwcqx00w1gbpb6vlkn8nchyfj1fsc8c06vgda0sgxp7qs5gn";
hash = "sha256-4FYTFUIvGjea3bh2GbQYG7hSswVDdNS3S+jWQ9+inpg=";
};
dontConfigure = true;

4
pkgs/os-specific/linux/vdo/default.nix
View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "vdo";
version = "8.1.1.360"; # kvdo uses this!
version = "8.2.0.2"; # kvdo uses this!
src = fetchFromGitHub {
owner = "dm-vdo";
repo = pname;
rev = version;
sha256 = "1zp8aaw0diramnlx5z96jcpbm6x0r204xf1vwq6k21rzcazczkwv";
hash = "sha256-IP/nL4jQ+rIWuUxXUiBtlIKTMZCNelvxgTfTcaB1it0=";
};
nativeBuildInputs = [