From f2af8874e8fa2265d1847d8fec9cc271de7f2efa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 1 Apr 2016 17:30:34 +0200 Subject: Revert "initrd: Use modprobe from busybox" This reverts commit 45c218f893d38f94cd62fc256117b9fb1a0d1749. Busybox's modprobe causes numerous "Unknown symbol" errors in the kernel log, even though the modules do appear to load correctly. --- nixos/modules/system/boot/stage-1.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos/modules/system/boot') diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 757d883373ac..7b13a305f035 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. -- cgit 1.4.1 From 53e8e9393904d8f585cfd39d6843f51ef0b49efe Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Wed, 6 Apr 2016 00:06:53 +1000 Subject: nixos/stage-1: Removed logCommands conditional for resetting the file descriptors after completion of logging --- nixos/modules/system/boot/stage-1-init.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'nixos/modules/system/boot') 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. -- cgit 1.4.1