nixos-modules/microvm/store-disk: make squashfs/erofs flags configurable

astro · Dec 10, 2024 · 02c5b7a · 02c5b7a
1 parent 1164dfc
commit 02c5b7a
Showing 1 changed file with 26 additions and 14 deletions.
diff --git a/nixos-modules/microvm/store-disk.nix b/nixos-modules/microvm/store-disk.nix
@@ -7,18 +7,8 @@ let
 
   kernelAtLeast = lib.versionAtLeast config.boot.kernelPackages.kernel.version;
 
-  erofsFlags = builtins.concatStringsSep " " (
-    [ "-zlz4hc" "--force-uid=0" "--force-gid=0" ]
-    # ++
-    # lib.optional (kernelAtLeast "5.13") "-C1048576"
-    ++
-    lib.optional (kernelAtLeast "5.16") "-Eztailpacking"
-    ++
-    lib.optionals (kernelAtLeast "6.1") [
-      "-Efragments"
-      # "-Ededupe"
-    ]
-  );
+  erofsFlags = builtins.concatStringsSep " " config.microvm.storeDiskErofsFlags;
+  squashfsFlags = builtins.concatStringsSep " " config.microvm.storeDiskSquashfsFlags;
 
   writeClosure = pkgs.writeClosure or pkgs.writeReferencesToFile;
 
@@ -32,6 +22,28 @@ in
       '';
     };
 
+    storeDiskErofsFlags = mkOption {
+      type = with types; listOf str;
+      default =
+        [
+          "-zlz4hc"
+        ]
+        # ++
+        # lib.optional (kernelAtLeast "5.13") "-C1048576"
+        ++
+        lib.optional (kernelAtLeast "5.16") "-Eztailpacking"
+        ++
+        lib.optionals (kernelAtLeast "6.1") [
+          "-Efragments"
+          # "-Ededupe"
+        ];
+    };
+
+    storeDiskSquashfsFlags = mkOption {
+      type = with types; listOf str;
+      default = [ "-c" "zstd" ];
+    };
+
     storeDisk = mkOption {
       type = types.path;
       description = ''
@@ -81,8 +93,8 @@ in
 
         echo Creating a ${config.microvm.storeDiskType}
         ${{
-          squashfs = "gensquashfs -D store --all-root -c zstd -q $out";
-          erofs = "mkfs.erofs ${erofsFlags} -L nix-store --mount-point=/nix/store $out store";
+          squashfs = "gensquashfs -D store --all-root -q ${squashfsFlags} $out";
+          erofs = "mkfs.erofs ${erofsFlags} -T 0 --all-root -L nix-store --mount-point=/nix/store $out store";
         }.${config.microvm.storeDiskType}}
       '';
     })