diff options
| author | Graham Christensen <graham@grahamc.com> | 2018-11-26 17:51:18 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-11-26 17:51:18 -0500 |
| commit | 6db866cbd2e90525163074788dabbb3d7374e0ba (patch) | |
| tree | 8de3b2011ca3572532ef6d7d52b7d19a43a86d20 /nixos/modules/profiles/base.nix | |
| parent | 39bfdab345e49ad01011d67ecf31d048944e6bf0 (diff) | |
| download | nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar.gz nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar.bz2 nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar.lz nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar.xz nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.tar.zst nixpkgs-6db866cbd2e90525163074788dabbb3d7374e0ba.zip | |
Revert "zfs cannot be distributed. Disabling it in the isos."
ZFS's popularity is growing, and not including it by default is a bit frustrating. On top of that, the base iso includes ZFS _anyway_ due to other packages depending upon it. I think we're in the clear to do this on the basis that Oracle probably doesn't care, it is probably fine (the SFLC agrees) and we're a small fish. If a copyright holder asks us to, we can definitely revert it again. This reverts commit 33d07c7ea9f0d05d47dd4b41ded3b261380acfac.
Diffstat (limited to 'nixos/modules/profiles/base.nix')
| -rw-r--r-- | nixos/modules/profiles/base.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 7e14b0e2114..2a2fe119d30 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -49,7 +49,7 @@ ]; # Include support for various filesystems. - boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; + boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ]; # Configure host id for ZFS to work networking.hostId = lib.mkDefault "8425e349"; |