diff options
| author | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-04-07 21:52:26 +0000 |
| commit | 3e68106afd95df012ddb548575f0133681687a90 (patch) | |
| tree | e2919b6900e6de13a3f52756acc02058a1ef0421 /nixos/modules/system | |
| parent | a73a28de7b16734d8e28da8be43a06b92eeb6bc3 (diff) | |
| parent | 25cc1c12febf74c66d661528e2fc2b00caff1bf1 (diff) | |
| download | nixlib-3e68106afd95df012ddb548575f0133681687a90.tar nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.gz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.bz2 nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.lz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.xz nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.zst nixlib-3e68106afd95df012ddb548575f0133681687a90.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'nixos/modules/system')
| -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. |