treewide: use configured zfs package
Some checks failed
Check flake / build-amd64-linux (push) Failing after 1m1s

This commit is contained in:
2026-01-09 22:53:38 +00:00
parent fdbfd9cfe9
commit 7545f7618d
2 changed files with 4 additions and 4 deletions

View File

@@ -1,6 +1,5 @@
{ {
config, config,
pkgs,
lib, lib,
... ...
}: }:
@@ -9,6 +8,7 @@ let
mkIf mkIf
optionals optionals
; ;
zfsPkg = config.boot.zfs.package;
in in
{ {
boot.zfs.forceImportRoot = false; boot.zfs.forceImportRoot = false;
@@ -24,7 +24,7 @@ in
unitConfig.DefaultDependencies = "no"; unitConfig.DefaultDependencies = "no";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank"; ExecStart = "${zfsPkg}/bin/zfs rollback -r rpool/local/root@blank";
}; };
}; };

View File

@@ -1,5 +1,4 @@
{ {
pkgs,
lib, lib,
config, config,
... ...
@@ -9,6 +8,7 @@ with lib;
let let
cfg = config.modules.podman; cfg = config.modules.podman;
zfsPkg = config.boot.zfs.package;
in in
{ {
options.modules.podman = { options.modules.podman = {
@@ -29,7 +29,7 @@ in
dates = "weekly"; dates = "weekly";
flags = [ "--all" ]; flags = [ "--all" ];
}; };
extraPackages = [ pkgs.zfs ]; extraPackages = [ zfsPkg ];
}; };
containers.storage.settings.storage = { containers.storage.settings.storage = {