From ff3d9902e02ba47f2b4f2ed0be22778aab8c3b9b Mon Sep 17 00:00:00 2001 From: Rvfg Date: Wed, 25 Oct 2023 10:50:03 +0800 Subject: [PATCH] nixos-rebuild: use --pipe instead of --pty in systemd-run --- nixos/tests/nixos-rebuild-install-bootloader.nix | 2 +- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/nixos-rebuild-install-bootloader.nix b/nixos/tests/nixos-rebuild-install-bootloader.nix index 3ade90ea24a7..94554a93bd63 100644 --- a/nixos/tests/nixos-rebuild-install-bootloader.nix +++ b/nixos/tests/nixos-rebuild-install-bootloader.nix @@ -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 diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index bde6ff9d959b..32eab42ec1fd 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -752,7 +752,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = "-E" "NIXOS_INSTALL_BOOTLOADER" "--collect" "--no-ask-password" - "--pty" + "--pipe" "--quiet" "--same-dir" "--service-type=exec"