From 408a30c286368185b4622b2312ff23dbd93c366d Mon Sep 17 00:00:00 2001 From: Astro Date: Fri, 28 Oct 2022 02:53:34 +0200 Subject: [PATCH] riscbert: get netboot towards stage-2 --- hosts/riscbert/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hosts/riscbert/default.nix b/hosts/riscbert/default.nix index 23c1b5a5..32a80066 100644 --- a/hosts/riscbert/default.nix +++ b/hosts/riscbert/default.nix @@ -4,8 +4,10 @@ boot = { kernelParams = [ - "verbose" "shell_on_fail" + "verbose" + # "console=ttyS0,115200n8" "elevator=deadline" + "boot.shell_on_fail" ]; initrd = { network = { @@ -17,8 +19,8 @@ ]; # includeDefaultModules = false; availableKernelModules = [ - "stmmac-platform" - "nfs" + "dwmac-generic" + "nfs" "nfsv4" "usbhid" ]; }; @@ -39,7 +41,7 @@ fileSystems."/" = { device = "${hostRegistry.hosts.nfsroot.ip4}:/var/lib/nfsroot/riscbert"; fsType = "nfs"; - options = [ "nfsvers=3" "proto=tcp" "nolock" "hard" "async" "rw" ]; + options = [ "nfsvers=4" "proto=tcp" "nolock" "hard" "async" "rw" ]; }; system.build.bootFiles = pkgs.runCommand "boot-files" {} ''