initrd: fix network

fsr · Jan 29, 2024 · b8c31b4 · b8c31b4
1 parent ccd6290
commit b8c31b4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/hosts/quitte/network.nix b/hosts/quitte/network.nix
@@ -43,7 +43,7 @@ in
     enable = true;
 
     # Interfaces on the machine
-    networks."10-ether-bond" = {
+    networks."10-wired-default" = {
       matchConfig.Name = "ens18";
 
       address = [ "141.30.30.169/25" ];

diff --git a/modules/initrd-ssh.nix b/modules/initrd-ssh.nix
@@ -3,16 +3,25 @@
 # Generate another SSH host key for the machine:
 # $ ssh-keygen -t ed25519 -N "" -f /etc/ssh/ssh_host_ed25519_key_initrd -C HOSTNAME-initrd
 # Add the public key to your known_hosts and create an ssh config entry.
-{ ... }:
+{ config, ... }:
 {
-  boot.initrd.network = {
-    enable = true;
-    ssh = {
+  boot.initrd = {
+    systemd = {
       enable = true;
-      port = 222;
-      shell = "/bin/cryptsetup-askpass";
-      hostKeys = [ "/etc/ssh/ssh_host_ed25519_key_initrd" ];
-      # authorizedKeys option inherits root's authorizedKeys.keys, but not keyFiles
+      network = {
+        enable = true;
+        networks."10-wired-default" = config.systemd.network.networks."10-wired-default";
+      };
+      users.root.shell = "/bin/cryptsetup-askpass";
+    };
+    network = {
+      enable = true;
+      ssh = {
+        enable = true;
+        port = 222;
+        hostKeys = [ "/etc/ssh/ssh_host_ed25519_key_initrd" ];
+        # authorizedKeys option inherits root's authorizedKeys.keys, but not keyFiles
+      };
     };
   };
 }