From 2b40187198d43949d6609aa6442e5ab7769a343d Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 9 Jan 2024 18:48:37 +0100 Subject: [PATCH] dacbert: repair evaluation with boot.initrd.systemd --- hosts/dacbert/default.nix | 3 +++ modules/rpi-netboot.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix index 3e074fb9..e563a62e 100644 --- a/hosts/dacbert/default.nix +++ b/hosts/dacbert/default.nix @@ -100,6 +100,9 @@ in useTmpfs = true; tmpfsSize = "80%"; }; + + # HACK + initrd.secrets = lib.mkForce {}; }; # hardware.raspberry-pi."4" = { # fkms-3d.enable = true; diff --git a/modules/rpi-netboot.nix b/modules/rpi-netboot.nix index f1c34ad3..a70b4324 100644 --- a/modules/rpi-netboot.nix +++ b/modules/rpi-netboot.nix @@ -24,7 +24,7 @@ enable = true; flushBeforeStage2 = false; # DHCP: 120 tries every 1 second - udhcpc.extraArgs = [ "-t" "120" "-T" "1" ]; + udhcpc.extraArgs = lib.mkIf (!config.boot.initrd.systemd.enable) [ "-t" "120" "-T" "1" ]; }; supportedFilesystems = lib.mkForce [ "nfs"