builders: do not mount / and /boot on netboot systems

flake.lock

@@ -258,17 +258,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1721682989,
+        "lastModified": 1722688238,
-        "narHash": "sha256-kjJiZ7m4HKqbZ2mxNQiB32/goKFb8BRi8OqC4wIU0OI=",
+        "narHash": "sha256-x6BnYtArF6IDs7bS8ExokgAQBOlrxXxD0EOBIlASmfM=",
         "ref": "refs/heads/main",
-        "rev": "4b107e6ff36bd89958fba36e0fe0340903e7cd13",
+        "rev": "9b5ac87de73ea4646dbb2af979db91f096d29960",
-        "revCount": 4190,
+        "revCount": 4191,
         "type": "git",
-        "url": "https://git.lix.systems/lix-project/hydra.git"
+        "url": "https://git.lix.systems/the-distro/hydra.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.lix.systems/lix-project/hydra.git"
+        "url": "https://git.lix.systems/the-distro/hydra.git"
       }
     },
     "lix": {

flake.nix

@@ -11,7 +11,7 @@
     colmena.url = "github:zhaofengli/colmena";
     colmena.inputs.nixpkgs.follows = "nixpkgs";
 
-    hydra.url = "git+https://git.lix.systems/lix-project/hydra.git";
+    hydra.url = "git+https://git.lix.systems/the-distro/hydra.git";
     hydra.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git";

services/baremetal-builder/default.nix

@@ -55,29 +55,34 @@ in
 
     boot.initrd.services.lvm.enable = true;
 
-    fileSystems."/" = {
-      device = "/dev/disk/by-label/root";
-      fsType = "xfs";
-    };
-
-    fileSystems."/mnt" = {
-      device = "/dev/disk/by-label/hydra";
-      fsType = "xfs";
-      options = ["logbsize=256k"];
-    };
     boot.kernel.sysctl."fs.xfs.xfssyncd_centisecs" = "12000";
+    fileSystems = lib.mkMerge [
+      {
+        "/" = {
+          device = "/dev/disk/by-label/root";
+          fsType = "xfs";
+        };
 
-    # We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks
+        "/boot" = {
-    fileSystems."/tmp" = {
+          device = "/dev/disk/by-label/BOOT";
-      device = "/mnt/tmp";
+          fsType = "vfat";
-      options = [ "bind" ];
+          options = [ "fmask=0022" "dmask=0022" ];
-    };
+        };
+      }
+      (lib.mkIf (!cfg.netboot) {
+        "/mnt" = {
+          device = "/dev/disk/by-label/hydra";
+          fsType = "xfs";
+          options = ["logbsize=256k"];
+        };
 
-    fileSystems."/boot" = {
+        # We want the tmp filesystem on the same filesystem as the hydra store, so that builds can use reflinks
-      device = "/dev/disk/by-label/BOOT";
+        "/tmp" = {
-      fsType = "vfat";
+          device = "/mnt/tmp";
-      options = [ "fmask=0022" "dmask=0022" ];
+          options = [ "bind" ];
-    };
+        };
+      })
+    ];
 
     swapDevices = lib.optionals (!cfg.netboot) [
       {