From 91db63482074929397412255dc44fba33f8653fe Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Tue, 17 Sep 2024 10:06:56 +0800
Subject: [PATCH] devices.srv1.node1: fix nfs

---
 devices/srv1/node1/default.nix    | 8 ++++++++
 modules/system/default.nix        | 2 +-
 modules/system/initrd.nix         | 3 ++-
 modules/system/kernel/default.nix | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/devices/srv1/node1/default.nix b/devices/srv1/node1/default.nix
index 0b08a0e0..0a7bfdf2 100644
--- a/devices/srv1/node1/default.nix
+++ b/devices/srv1/node1/default.nix
@@ -13,6 +13,7 @@ inputs:
           eno2 = { ip = "192.168.178.2"; mask = 24; gateway = "192.168.178.1"; };
         };
         cluster.nodeType = "worker";
+        initrd.sshd.enable = true;
       };
       services.beesd.instances.root = { device = "/"; hashTableSizeMB = 256; threads = 4; };
       packages =
@@ -48,6 +49,13 @@ inputs:
       };
     };
     boot.initrd.network.enable = true; 
+    boot.initrd.systemd.network.networks."10-eno2" = inputs.config.systemd.network.networks."10-eno2";
+    boot.initrd.systemd.extraBin =
+    {
+      "ifconfig" = "${inputs.pkgs.nettools}/bin/ifconfig";
+      "mount.nfs" = "${inputs.pkgs.nfs-utils}/bin/mount.nfs";
+      "mount.nfs4" = "${inputs.pkgs.nfs-utils}/bin/mount.nfs4";
+    };
     services.rpcbind.enable = true;
   };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 97645068..0f8df97a 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -14,7 +14,7 @@ inputs:
     time.timeZone = "Asia/Shanghai";
     boot =
     {
-      supportedFilesystems = [ "ntfs" "nfs" ];
+      supportedFilesystems = [ "ntfs" "nfs" "nfsv4" ];
       # consoleLogLevel = 7;
     };
     hardware.enableAllFirmware = true;
diff --git a/modules/system/initrd.nix b/modules/system/initrd.nix
index 317f35e4..4c64ec81 100644
--- a/modules/system/initrd.nix
+++ b/modules/system/initrd.nix
@@ -34,7 +34,8 @@ inputs:
             services.resolved.enable = false;
           };
           # ip=dhcp only attain ipv4
-          kernelParams = [ "ip=on" ];
+          # ip=on will reset systemd-networkd configs
+          # kernelParams = [ "ip=on" ];
         };
       }
     )
diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix
index e65e742c..6457fb3f 100644
--- a/modules/system/kernel/default.nix
+++ b/modules/system/kernel/default.nix
@@ -34,7 +34,7 @@ inputs:
           # disk for srv1
           "megaraid_sas"
           # disks for cluster
-          "nfs"
+          "nfs" "nfsv4"
           # netowrk for srv1
           "bnx2x" "tg3"
         ]