boop: more initrd configs :3

ifd3f · Mar 28, 2024 · d34e27c · d34e27c
1 parent f9e05de
commit d34e27c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/machines/boop/boot.nix b/machines/boop/boot.nix
@@ -25,7 +25,7 @@ in {
     "usbhid"
     "usb_storage"
     "sd_mod"
-    "tg3" # tg3 needed for initrd networking on this machine
+    "tg3" # needed for initrd networking on this machine
   ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
@@ -34,12 +34,22 @@ in {
   # because we want to be able to decrypt host keys over SSH
   boot.initrd.network = {
     enable = true;
-    udhcpc.enable = true;
+    udhcpc = {
+      enable = true;
+      extraArgs = [
+        "-i"
+        constants.mgmt_if
+        "-x"
+        "hostname:boop"
+        "-b" # background if lease not obtained
+      ];
+    };
     postCommands = ''
       ip addr
     '';
     ssh = {
       enable = true;
+      port = 2222; # because we are using a different host key
       hostKeys = [
         (pkgs.writeText "ssh_host_rsa_key"
           (builtins.readFile ./initrd/ssh_host_rsa_key))

diff --git a/machines/boop/configuration.nix b/machines/boop/configuration.nix
@@ -45,9 +45,6 @@ with lib; {
     recommendedOptimisation = true;
     recommendedGzipSettings = true;
   };
-
-  # tmp for debug
-  services.getty.autologinUser = "root";
 
   virtualisation.vmVariant = {
     # Autologin as root because we testin here