From 5b7c6aafffaabd4da07e124de26181cea9dbe76e Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Apr 2024 18:48:02 +0200 Subject: [PATCH 1/2] types.filesystem: add exfat pkgs --- lib/types/filesystem.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/types/filesystem.nix b/lib/types/filesystem.nix index 4ab0f0d8..1edc862e 100644 --- a/lib/types/filesystem.nix +++ b/lib/types/filesystem.nix @@ -86,6 +86,7 @@ if (config.format == "xfs") then [ pkgs.xfsprogs ] else if (config.format == "btrfs") then [ pkgs.btrfs-progs ] else if (config.format == "vfat") then [ pkgs.dosfstools ] + else if (config.format == "exfat") then [ pkgs.exfat ] else if (config.format == "ext2") then [ pkgs.e2fsprogs ] else if (config.format == "ext3") then [ pkgs.e2fsprogs ] else if (config.format == "ext4") then [ pkgs.e2fsprogs ] From e5874ca3ea8cb669e42f8767fbb07a8390d43c49 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 30 May 2024 13:39:54 +0200 Subject: [PATCH 2/2] mdadm: run sgdisk before partprobe --- lib/types/mdadm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types/mdadm.nix b/lib/types/mdadm.nix index 1564e178..65f17151 100644 --- a/lib/types/mdadm.nix +++ b/lib/types/mdadm.nix @@ -43,11 +43,11 @@ --force \ --homehost=any \ "''${disk_devices[@]}" - partprobe /dev/md/${config.name} udevadm trigger --subsystem-match=block udevadm settle # for some reason mdadm devices spawn with an existing partition table, so we need to wipe it sgdisk --zap-all /dev/md/${config.name} + partprobe /dev/md/${config.name} fi ${lib.optionalString (config.content != null) config.content._create} '';