diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2024-01-03 04:30:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 04:30:27 -0500 |
| commit | 05706b850aa26a81431bf6dc18405010f2dfa06c (patch) | |
| tree | 75430524e8d2b566ad0a42b54afd42519c1c54cd /nixos/modules/system | |
| parent | 635e1006e4fc8befddf2a0bc12930b810e020009 (diff) | |
| parent | a514d8c148e78d0d222689bdae55d242e0ff454e (diff) | |
| download | nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar.gz nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar.bz2 nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar.lz nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar.xz nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.tar.zst nixlib-05706b850aa26a81431bf6dc18405010f2dfa06c.zip | |
Merge pull request #273695 from lopsided98/initrd-systemd-lib-firmware
systemd-stage-1: allow non-existent /lib/firmware
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index d7e8a67c4bc9..4ae07944afc3 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -396,8 +396,7 @@ in { ManagerEnvironment=${lib.concatStringsSep " " (lib.mapAttrsToList (n: v: "${n}=${lib.escapeShellArg v}") cfg.managerEnvironment)} ''; - "/lib/modules".source = "${modulesClosure}/lib/modules"; - "/lib/firmware".source = "${modulesClosure}/lib/firmware"; + "/lib".source = "${modulesClosure}/lib"; "/etc/modules-load.d/nixos.conf".text = concatStringsSep "\n" config.boot.initrd.kernelModules; |