Skip to content

Commit 6eb3487

Browse files
committed
exfat support
1 parent 2db1d64 commit 6eb3487

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

example/complex.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@
107107
lvm_type = "mirror";
108108
content = {
109109
type = "filesystem";
110-
format = "ext4";
111-
mountpoint = "/ext4_on_lvm";
110+
format = "exfat";
111+
mountpoint = "/exfat_on_lvm";
112112
mountOptions = [
113113
"defaults"
114114
];
115115
postMountHook = ''
116-
touch /mnt/ext4_on_lvm/file-from-postMountHook
116+
touch /mnt/exfat_on_lvm/file-from-postMountHook
117117
'';
118118
};
119119
};

lib/types/filesystem.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
pkgs.gnugrep
107107
]
108108
++ (
109-
# TODO add many more
110109
if (config.format == "xfs") then
111110
[ pkgs.xfsprogs ]
112111
else if (config.format == "btrfs") then
@@ -123,6 +122,8 @@
123122
[ pkgs.bcachefs-tools ]
124123
else if (config.format == "f2fs") then
125124
[ pkgs.f2fs-tools ]
125+
else if (config.format == "exfat") then
126+
[ pkgs.exfatprogs ]
126127
else
127128
[ ]
128129
);

tests/cli.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ diskoLib.testLib.makeDiskoTest {
1919
machine.succeed("mountpoint /zfs_fs");
2020
machine.succeed("mountpoint /zfs_legacy_fs");
2121
machine.succeed("mountpoint /ext4onzfs");
22-
machine.succeed("mountpoint /ext4_on_lvm");
22+
machine.succeed("mountpoint /exfat_on_lvm");
2323
'';
2424
extraSystemConfig = {
2525
imports = [

tests/complex.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ diskoLib.testLib.makeDiskoTest {
1919
machine.succeed("mountpoint /zfs_fs");
2020
machine.succeed("mountpoint /zfs_legacy_fs");
2121
machine.succeed("mountpoint /ext4onzfs");
22-
machine.succeed("mountpoint /ext4_on_lvm");
22+
machine.succeed("mountpoint /exfat_on_lvm");
2323
2424
25-
machine.succeed("test -e /ext4_on_lvm/file-from-postMountHook");
25+
machine.succeed("test -e /exfat_on_lvm/file-from-postMountHook");
2626
'';
2727
extraInstallerConfig = {
2828
boot.kernelModules = [

0 commit comments

Comments
 (0)