From 38638fa5febab2049e1ca66ff82e727e77673715 Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Wed, 14 Feb 2024 16:58:40 +0800 Subject: [PATCH] fix modprobe and nix-path-registration error --- pr-28.patch | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pr-28.patch b/pr-28.patch index db36551..6f8b440 100644 --- a/pr-28.patch +++ b/pr-28.patch @@ -23,11 +23,35 @@ index 7eaee32..c0a88c0 100644 bashrc.text = "export PATH=/run/current-system/sw/bin"; profile.text = "export PATH=/run/current-system/sw/bin"; "resolv.conf".text = "nameserver 10.0.2.3"; +diff --git a/runit.nix b/runit.nix +index d7b0bf3..70353a1 100644 +--- a/runit.nix ++++ b/runit.nix +@@ -65,7 +65,6 @@ in + ''; + "service/nix/run".source = pkgs.writeScript "nix" '' + #!${pkgs.runtimeShell} +- nix-store --load-db < /nix/store/nix-path-registration + nix-daemon + ''; + } diff --git a/stage-1.nix b/stage-1.nix -index 331fecd..85fda30 100644 +index 331fecd..aa5148e 100644 --- a/stage-1.nix +++ b/stage-1.nix -@@ -164,7 +164,9 @@ let +@@ -117,11 +117,6 @@ let + plymouth --show-splash + ''} + +- +- for x in ${lib.concatStringsSep " " config.boot.initrd.kernelModules}; do +- modprobe $x +- done +- + root=/dev/vda + realroot=tmpfs + for o in $(cat /proc/cmdline); do +@@ -164,7 +159,9 @@ let mkdir -p /mnt/nix/store/ @@ -38,7 +62,7 @@ index 331fecd..85fda30 100644 # make the store writeable mkdir -p /mnt/nix/.ro-store /mnt/nix/.overlay-store /mnt/nix/store mount $root /mnt/nix/.ro-store -t squashfs -@@ -190,6 +192,11 @@ let +@@ -190,6 +187,11 @@ let initialRamdisk = pkgs.makeInitrd { contents = [ { object = bootStage1; symlink = "/init"; } ]; }; @@ -50,7 +74,7 @@ index 331fecd..85fda30 100644 in { options = { -@@ -205,6 +212,7 @@ in +@@ -205,6 +207,7 @@ in config = { system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk;