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

nixos-rebuild: use --pipe instead of --pty in systemd-run

Browse Source
This commit is contained in:
Rvfg 2023-10-25 10:50:03 +08:00
parent a3a75ec908
commit ff3d9902e0
No known key found for this signature in database
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/nixos-rebuild-install-bootloader.nix
View File

@ -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

2
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

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