Skip to content

Commit d1368d2

Browse files
committed
fix: fix nixiso configuration not building due to broken zfs kernel module
1 parent 454567a commit d1368d2

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

hosts/nixiso/default.nix

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,18 @@ in {
5353

5454
# ensure latest kernel & filesystem pkgs are installed
5555
boot = {
56-
kernelPackages = pkgs.linuxPackages_zen;
57-
supportedFilesystems =
58-
[ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" "ext4" ];
56+
kernelPackages = pkgs.linuxPackages_latest;
57+
supportedFilesystems = {
58+
btrfs = true;
59+
cifs = true;
60+
ext4 = true;
61+
f2fs = true;
62+
ntfs = true;
63+
reiserfs = true;
64+
vfat = true;
65+
xfs = true;
66+
zfs = false;
67+
};
5968
};
6069

6170
networking.networkmanager.enable = true;

modules/nixos/base/default.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ in {
163163

164164
binfmt.emulatedSystems = [ "aarch64-linux" "x86_64-windows" ];
165165

166-
supportedFilesystems = (optional cfg.fs.btrfs "btrfs")
167-
++ (optional cfg.fs.zfs "zfs");
166+
supportedFilesystems = {
167+
btrfs = mkIf cfg.fs.btrfs true;
168+
zfs = mkIf cfg.fs.zfs true;
169+
};
168170
zfs.forceImportRoot = mkIf cfg.fs.zfs (mkDefault false);
169171
consoleLogLevel = 0;
170172
};

0 commit comments

Comments
 (0)