gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/stage-1: typo fixes

Browse Source
This commit is contained in:
Maximilian Bosch
2022-02-27 14:06:45 +01:00
parent e110983ed3
commit 1077a6e040
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/system/boot/stage-1-init.sh
View File

@@ -232,6 +232,7 @@ done
mkdir -p /lib mkdir -p /lib
ln -s @modulesClosure@/lib/modules /lib/modules ln -s @modulesClosure@/lib/modules /lib/modules
ln -s @modulesClosure@/lib/firmware /lib/firmware ln -s @modulesClosure@/lib/firmware /lib/firmware
# see comment in stage-1.nix for explanation
echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe echo @extraUtils@/bin/modprobe-kernel > /proc/sys/kernel/modprobe
for i in @kernelModules@; do for i in @kernelModules@; do
info "loading module $(basename $i)..." info "loading module $(basename $i)..."

2
nixos/modules/system/boot/stage-1.nix
View File

@@ -140,7 +140,7 @@ let
# kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists. # kmod/modprobe points to glibc's `$out/lib` where `libpthread.so.6` exists.
# However, this is a problem when the kernel calls `modprobe` inside # However, this is a problem when the kernel calls `modprobe` inside
# the initial ramdisk because it doesn't know about the # the initial ramdisk because it doesn't know about the
# `LD_LIbRARY_PATH` and the rpath was nuked. # `LD_LIBRARY_PATH` and the rpath was nuked.
# #
# Also, we can't use `makeWrapper` here because `kmod` only does # Also, we can't use `makeWrapper` here because `kmod` only does
# `modprobe` functionality if `argv[0] == "modprobe"`. # `modprobe` functionality if `argv[0] == "modprobe"`.