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

Merge pull request #14474 from MatrixAI/fixed-stage1 

nixos/stage-1: Removed logCommands conditional for resetting the file descriptors after completion of logging
This commit is contained in:
joachifm 2016-04-05 22:39:14 +02:00
parent 56d45e9b99 53e8e93939
commit 97c8bf61ef
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,11 +434,8 @@ udevadm control --exit
# Reset the logging file descriptors. # Reset the logging file descriptors.
# Do this just before pkill, which will kill the tee process. # Do this just before pkill, which will kill the tee process.
if test -n "@logCommands@" exec 1>&$logOutFd 2>&$logErrFd
then eval "exec $logOutFd>&- $logErrFd>&-"
exec 1>&$logOutFd 2>&$logErrFd
eval "exec $logOutFd>&- $logErrFd>&-"
fi
# Kill any remaining processes, just to be sure we're not taking any # 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. # with us into stage 2. But keep storage daemons like unionfs-fuse.