From 0dc68a4c775abcc52fc347986a585106fc644297 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Tue, 8 Sep 2026 23:08:36 +0200
Subject: [PATCH 1/2] nixos/image/repart-image: fix Format=empty

(cherry picked from commit e72abfc4a0d77661f668efbaf1493f21617982fb)
---
 nixos/modules/image/repart-image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix
index 9b4447b18816..35caf88484ca 100644
--- a/nixos/modules/image/repart-image.nix
+++ b/nixos/modules/image/repart-image.nix
@@ -110,6 +110,7 @@ let
     "btrfs" = [ btrfs-progs ];
     "xfs" = [ xfsprogs ];
     "swap" = [ util-linux ];
+    "empty" = [ ];
   };
 
   fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems;

From da17d712d599c8b972c7638b21c10903b029f151 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Tue, 8 Sep 2026 23:13:11 +0200
Subject: [PATCH 2/2] nixos/tests/repart: test all fs types

(cherry picked from commit c34b750b14a7981615fd8854c9ab1586f8f5df04)
---
 nixos/tests/appliance-repart-image.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/appliance-repart-image.nix b/nixos/tests/appliance-repart-image.nix
index bba163b463e4..bd11bdc1de28 100644
--- a/nixos/tests/appliance-repart-image.nix
+++ b/nixos/tests/appliance-repart-image.nix
@@ -90,7 +90,16 @@ in
               Minimize = "guess";
             };
           };
-        };
+        }
+        // (lib.genAttrs [ "squashfs" "erofs" "btrfs" "xfs" "swap" "empty" ] (fsType: {
+          repartConfig = {
+            Type = "linux-generic";
+            Format = fsType;
+
+            SizeMinBytes = "10M";
+            SizeMaxBytes = "10M";
+          };
+        }));
       };
     };