Unverified Commit 48f9437c authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

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

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

nixos/tests/nixos-rebuild-install-bootloader.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"