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

nixos/zfs: expose enabled option

Browse source
This commit is contained in:
Jörg Thalheim 2021-01-15 13:18:34 +01:00
parent 648a6c4348
commit ed1f13244b
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/modules/tasks/filesystems/zfs.nix
View file

@ -17,8 +17,6 @@ let
inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
enableZfs = inInitrd || inSystem;
autosnapPkg = pkgs.zfstools.override { autosnapPkg = pkgs.zfstools.override {
zfs = cfgZfs.package; zfs = cfgZfs.package;
}; };
@ -107,6 +105,14 @@ in
default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; default = if config.boot.zfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs;
description = "Configured ZFS userland tools package."; description = "Configured ZFS userland tools package.";
}; };
enabled = mkOption {
readOnly = true;
type = types.bool;
default = inInitrd || inSystem;
description = "True if ZFS filesystem support is enabled";
};
enableUnstable = mkOption { enableUnstable = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
@ -350,7 +356,7 @@ in
###### implementation ###### implementation
config = mkMerge [ config = mkMerge [
(mkIf enableZfs { (mkIf cfgZfs.enabled {
assertions = [ assertions = [
{ {
assertion = config.networking.hostId != null; assertion = config.networking.hostId != null;
@ -589,7 +595,7 @@ in
systemd.targets.zfs.wantedBy = [ "multi-user.target" ]; systemd.targets.zfs.wantedBy = [ "multi-user.target" ];
}) })
(mkIf (enableZfs && cfgSnapshots.enable) { (mkIf (cfgZfs.enabled && cfgSnapshots.enable) {
systemd.services = let systemd.services = let
descr = name: if name == "frequent" then "15 mins" descr = name: if name == "frequent" then "15 mins"
else if name == "hourly" then "hour" else if name == "hourly" then "hour"
@ -627,7 +633,7 @@ in
}) snapshotNames); }) snapshotNames);
}) })
(mkIf (enableZfs && cfgScrub.enable) { (mkIf (cfgZfs.enabled && cfgScrub.enable) {
systemd.services.zfs-scrub = { systemd.services.zfs-scrub = {
description = "ZFS pools scrubbing"; description = "ZFS pools scrubbing";
after = [ "zfs-import.target" ]; after = [ "zfs-import.target" ];
@ -654,7 +660,7 @@ in
}; };
}) })
(mkIf (enableZfs && cfgTrim.enable) { (mkIf (cfgZfs.enabled && cfgTrim.enable) {
systemd.services.zpool-trim = { systemd.services.zpool-trim = {
description = "ZFS pools trim"; description = "ZFS pools trim";
after = [ "zfs-import.target" ]; after = [ "zfs-import.target" ];