diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2024-03-28 18:25:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-28 18:25:08 +0000 |
| commit | 48f9437cd149432dc817bac7c625fb56aceb0250 (patch) | |
| tree | 8f571047386997849e9f6d1c72ece071dde2f199 | |
| parent | bc061915ac2cf395e4d1f021cb565f495edfa24a (diff) | |
| parent | ff3d9902e02ba47f2b4f2ed0be22778aab8c3b9b (diff) | |
| download | nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar.gz nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar.bz2 nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar.lz nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar.xz nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.tar.zst nixlib-48f9437cd149432dc817bac7c625fb56aceb0250.zip | |
Merge pull request #263360 from duament/nixos-rebuild-pipe
nixos-rebuild: use --pipe instead of --pty in systemd-run
| -rw-r--r-- | nixos/tests/nixos-rebuild-install-bootloader.nix | 2 | ||||
| -rwxr-xr-x | 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 1868f6b2af1b..248dc7213888 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -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" |