diff options
Diffstat (limited to 'nixos/modules/system/boot')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 7 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index c0c2b6a94164..1f8779abf0c3 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -434,11 +434,8 @@ udevadm control --exit # Reset the logging file descriptors. # Do this just before pkill, which will kill the tee process. -if test -n "@logCommands@" -then - exec 1>&$logOutFd 2>&$logErrFd - eval "exec $logOutFd>&- $logErrFd>&-" -fi +exec 1>&$logOutFd 2>&$logErrFd +eval "exec $logOutFd>&- $logErrFd>&-" # Kill any remaining processes, just to be sure we're not taking any # with us into stage 2. But keep storage daemons like unionfs-fuse. diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 49a1c9781530..7e84dd204773 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -67,6 +67,10 @@ let copy_bin_and_libs $BIN done + # Copy modprobe. + copy_bin_and_libs ${pkgs.kmod}/bin/kmod + ln -sf kmod $out/bin/modprobe + # Copy resize2fs if needed. ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) '' # We need mke2fs in the initrd. |