diff options
| author | joachifm <joachifm@users.noreply.github.com> | 2016-04-05 22:39:14 +0200 |
|---|---|---|
| committer | joachifm <joachifm@users.noreply.github.com> | 2016-04-05 22:39:14 +0200 |
| commit | 97c8bf61efc90fa68cf22e9d4d061fa207401731 (patch) | |
| tree | 5eca4ddfed3255bc372d1b243d3d88759bd9c7af /nixos | |
| parent | 56d45e9b998659d5adb28ba86de4053e9c9ef001 (diff) | |
| parent | 53e8e9393904d8f585cfd39d6843f51ef0b49efe (diff) | |
| download | nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar.gz nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar.bz2 nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar.lz nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar.xz nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.tar.zst nixlib-97c8bf61efc90fa68cf22e9d4d061fa207401731.zip | |
Merge pull request #14474 from MatrixAI/fixed-stage1
nixos/stage-1: Removed logCommands conditional for resetting the file descriptors after completion of logging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/stage-1-init.sh | 7 |
1 files changed, 2 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. |