Merge pull request #474 from Enzime/fix/zfs-root-dataset

zpool: fix default dataset getting shadowed
nix-community · Dec 20, 2023 · b4104fc · b4104fc
2 parents e74526b + 9f9ff67
commit b4104fc
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 0 deletions.
diff --git a/example/non-root-zfs.nix b/example/non-root-zfs.nix
@@ -0,0 +1,79 @@
+{
+  disko.devices = {
+    disk = {
+      x = {
+        type = "disk";
+        device = "/dev/sdx";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "64M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+      y = {
+        type = "disk";
+        device = "/dev/sdy";
+        content = {
+          type = "gpt";
+          partitions = {
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "storage";
+              };
+            };
+          };
+        };
+      };
+      z = {
+        type = "disk";
+        device = "/dev/sdz";
+        content = {
+          type = "gpt";
+          partitions = {
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "storage";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      storage = {
+        type = "zpool";
+        mode = "mirror";
+        mountpoint = "/storage";
+
+        datasets = {
+          dataset = {
+            type = "zfs_fs";
+            mountpoint = "/storage/dataset";
+          };
+        };
+      };
+    };
+  };
+}
+
diff --git a/lib/types/zpool.nix b/lib/types/zpool.nix
@@ -67,6 +67,9 @@
           ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-o ${n}=${v}") config.options)} \
           ${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "-O ${n}=${v}") config.rootFsOptions)} \
           "''${zfs_devices[@]}"
+        ${lib.optionalString ((config.rootFsOptions.mountpoint or "") != "none") ''
+          zfs unmount ${config.name}
+        ''}
         ${lib.concatMapStrings (dataset: dataset._create) (lib.attrValues config.datasets)}
       '';
     };

diff --git a/tests/non-root-zfs.nix b/tests/non-root-zfs.nix
@@ -0,0 +1,26 @@
+{ pkgs ? import <nixpkgs> { }
+, diskoLib ? pkgs.callPackage ../lib { }
+}:
+diskoLib.testLib.makeDiskoTest {
+  inherit pkgs;
+  name = "non-root-zfs";
+  disko-config = ../example/non-root-zfs.nix;
+  extraInstallerConfig.networking.hostId = "8425e349";
+  extraSystemConfig.networking.hostId = "8425e349";
+  postDisko = ''
+    machine.succeed("mountpoint /mnt/storage")
+    machine.succeed("mountpoint /mnt/storage/dataset")
+
+    filesystem = machine.execute("stat --file-system --format=%T /mnt/storage")[1].rstrip()
+    print(f"/mnt/storage {filesystem=}")
+    assert filesystem == "zfs", "/mnt/storage is not ZFS"
+  '';
+  extraTestScript = ''
+    machine.succeed("mountpoint /storage")
+    machine.succeed("mountpoint /storage/dataset")
+
+    filesystem = machine.execute("stat --file-system --format=%T /storage")[1].rstrip()
+    print(f"/mnt/storage {filesystem=}")
+    assert filesystem == "zfs", "/storage is not ZFS"
+  '';
+}