Merge pull request #263360 from duament/nixos-rebuild-pipe

nixos-rebuild: use --pipe instead of --pty in systemd-run
This commit is contained in:
Thiago Kenji Okada 2024-03-28 18:25:08 +00:00 committed by GitHub
commit 48f9437cd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -60,7 +60,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
# Need to run `nixos-rebuild` twice because the first run will install
# GRUB anyway
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
assert "updating GRUB 2 menu..." in result
assert "installing the GRUB 2 boot loader on /dev/vda..." in result

View File

@ -756,7 +756,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" =
"-E" "NIXOS_INSTALL_BOOTLOADER=$installBootloader"
"--collect"
"--no-ask-password"
"--pty"
"--pipe"
"--quiet"
"--same-dir"
"--service-type=exec"