mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-17 10:37:45 +03:00
Merge pull request #263360 from duament/nixos-rebuild-pipe
nixos-rebuild: use --pipe instead of --pty in systemd-run
This commit is contained in:
commit
48f9437cd1
@ -60,7 +60,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||||||
# Need to run `nixos-rebuild` twice because the first run will install
|
# Need to run `nixos-rebuild` twice because the first run will install
|
||||||
# GRUB anyway
|
# GRUB anyway
|
||||||
with subtest("Switch system again and install bootloader"):
|
with subtest("Switch system again and install bootloader"):
|
||||||
result = machine.succeed("nixos-rebuild switch --install-bootloader")
|
result = machine.succeed("nixos-rebuild switch --install-bootloader 2>&1")
|
||||||
# install-grub2.pl messages
|
# install-grub2.pl messages
|
||||||
assert "updating GRUB 2 menu..." in result
|
assert "updating GRUB 2 menu..." in result
|
||||||
assert "installing the GRUB 2 boot loader on /dev/vda..." in result
|
assert "installing the GRUB 2 boot loader on /dev/vda..." in result
|
||||||
|
@ -756,7 +756,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" =
|
|||||||
"-E" "NIXOS_INSTALL_BOOTLOADER=$installBootloader"
|
"-E" "NIXOS_INSTALL_BOOTLOADER=$installBootloader"
|
||||||
"--collect"
|
"--collect"
|
||||||
"--no-ask-password"
|
"--no-ask-password"
|
||||||
"--pty"
|
"--pipe"
|
||||||
"--quiet"
|
"--quiet"
|
||||||
"--same-dir"
|
"--same-dir"
|
||||||
"--service-type=exec"
|
"--service-type=exec"
|
||||||
|
Loading…
Reference in New Issue
Block a user