tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
(k)vdo: 8.1.1.360 -> 8.2.0.2
ajs124
3 years ago
c386f865
09bcb880
+7
-5
3 changed files
expand all
collapse all
unified
split
nixos
modules
tasks
lvm.nix
pkgs
os-specific
linux
kvdo
default.nix
vdo
default.nix
+4
-2
nixos/modules/tasks/lvm.nix
···
85
85
systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ];
86
86
87
87
extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable)''
88
88
-
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
88
88
+
ls ${pkgs.vdo}/bin/ | while read BIN; do
89
89
copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
90
90
done
91
91
+
substituteInPlace $out/bin/vdorecover --replace "${pkgs.bash}/bin/bash" "/bin/sh"
92
92
+
substituteInPlace $out/bin/adaptLVMVDO.sh --replace "${pkgs.bash}/bin/bash" "/bin/sh"
91
93
'';
92
94
93
95
extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)''
94
94
-
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
96
96
+
ls ${pkgs.vdo}/bin/ | grep -vE '(adaptLVMVDO|vdorecover)' | while read BIN; do
95
97
$out/bin/$(basename $BIN) --help > /dev/null
96
98
done
97
99
'';
+1
-1
pkgs/os-specific/linux/kvdo/default.nix
···
8
8
owner = "dm-vdo";
9
9
repo = "kvdo";
10
10
rev = version;
11
11
-
sha256 = "1xl7dwcqx00w1gbpb6vlkn8nchyfj1fsc8c06vgda0sgxp7qs5gn";
11
11
+
hash = "sha256-4FYTFUIvGjea3bh2GbQYG7hSswVDdNS3S+jWQ9+inpg=";
12
12
};
13
13
14
14
dontConfigure = true;
+2
-2
pkgs/os-specific/linux/vdo/default.nix
···
9
9
10
10
stdenv.mkDerivation rec {
11
11
pname = "vdo";
12
12
-
version = "8.1.1.360"; # kvdo uses this!
12
12
+
version = "8.2.0.2"; # kvdo uses this!
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "dm-vdo";
16
16
repo = pname;
17
17
rev = version;
18
18
-
sha256 = "1zp8aaw0diramnlx5z96jcpbm6x0r204xf1vwq6k21rzcazczkwv";
18
18
+
hash = "sha256-IP/nL4jQ+rIWuUxXUiBtlIKTMZCNelvxgTfTcaB1it0=";
19
19
};
20
20
21
21
nativeBuildInputs = [