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

test-instrumentation.nix: Only clear $PAGER in the backdoor shell

Browse Source
This commit is contained in:
Eelco Dolstra 2016-02-23 11:53:08 +01:00
parent 806b27a297
commit 6f6e2c430f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/modules/testing/test-instrumentation.nix
View File

@ -20,7 +20,15 @@ let kernel = config.boot.kernelPackages.kernel; in
export USER=root export USER=root
export HOME=/root export HOME=/root
export DISPLAY=:0.0 export DISPLAY=:0.0
source /etc/profile source /etc/profile
# Don't use a pager when executing backdoor
# actions. Because we use a tty, commands like systemctl
# or nix-store get confused into thinking they're running
# interactively.
export PAGER=
cd /tmp cd /tmp
exec < /dev/hvc0 > /dev/hvc0 exec < /dev/hvc0 > /dev/hvc0
while ! exec 2> /dev/ttyS0; do sleep 0.1; done while ! exec 2> /dev/ttyS0; do sleep 0.1; done
@ -38,11 +46,6 @@ let kernel = config.boot.kernelPackages.kernel; in
systemd.services."serial-getty@ttyS0".enable = false; systemd.services."serial-getty@ttyS0".enable = false;
systemd.services."serial-getty@hvc0".enable = false; systemd.services."serial-getty@hvc0".enable = false;
# Don't use a pager when executing backdoor actions. Because we
# use a tty, commands like systemctl or nix-store get confused
# into thinking they're running interactively.
environment.variables.PAGER = "";
boot.initrd.preDeviceCommands = boot.initrd.preDeviceCommands =
'' ''
echo 600 > /proc/sys/kernel/hung_task_timeout_secs echo 600 > /proc/sys/kernel/hung_task_timeout_secs