Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions example/complex.nix
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@
lvm_type = "mirror";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/ext4_on_lvm";
format = "exfat";
mountpoint = "/exfat_on_lvm";
mountOptions = [
"defaults"
];
postMountHook = ''
touch /mnt/ext4_on_lvm/file-from-postMountHook
touch /mnt/exfat_on_lvm/file-from-postMountHook
'';
};
};
Expand Down
3 changes: 2 additions & 1 deletion lib/types/filesystem.nix
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
pkgs.gnugrep
]
++ (
# TODO add many more
if (config.format == "xfs") then
[ pkgs.xfsprogs ]
else if (config.format == "btrfs") then
Expand All @@ -123,6 +122,8 @@
[ pkgs.bcachefs-tools ]
else if (config.format == "f2fs") then
[ pkgs.f2fs-tools ]
else if (config.format == "exfat") then
[ pkgs.exfatprogs ]
else
[ ]
);
Expand Down
2 changes: 1 addition & 1 deletion tests/cli.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ diskoLib.testLib.makeDiskoTest {
machine.succeed("mountpoint /zfs_fs");
machine.succeed("mountpoint /zfs_legacy_fs");
machine.succeed("mountpoint /ext4onzfs");
machine.succeed("mountpoint /ext4_on_lvm");
machine.succeed("mountpoint /exfat_on_lvm");
'';
extraSystemConfig = {
imports = [
Expand Down
4 changes: 2 additions & 2 deletions tests/complex.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ diskoLib.testLib.makeDiskoTest {
machine.succeed("mountpoint /zfs_fs");
machine.succeed("mountpoint /zfs_legacy_fs");
machine.succeed("mountpoint /ext4onzfs");
machine.succeed("mountpoint /ext4_on_lvm");
machine.succeed("mountpoint /exfat_on_lvm");


machine.succeed("test -e /ext4_on_lvm/file-from-postMountHook");
machine.succeed("test -e /exfat_on_lvm/file-from-postMountHook");
'';
extraInstallerConfig = {
boot.kernelModules = [
Expand Down