nixos-rebuild: Fix regression from #277642 #280842
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 09fd207. It caused a regression when using `--build-host` and flakes. See NixOS#277642 (comment)
This solves again the problem solved by 09fd207. To quote: > We always want to use `ssh -t` to force PTY allocation as there may be > interactive SSH prompts like trusting unknown hosts. However, the creation of a pseudoterminal causes the remote stdout and stderr to point to the same tty, resulting in a single stream in the ssh client, which breaks other usages of ssh, such as `--build-host`. Hence, this commit only sets the flag for invocations that need it - or would need it if sudo were disabled. That should help with development and gives a somewhat more consistent user experience.
13 tasks
roberth
force-pushed
the
regression-277642
branch
from
13c7be9
to
daa9408
Compare
"${a[@]}" => ok
"${foo:+a[@]}" => empty string when length is 0
roberth
force-pushed
the
regression-277642
branch
from
daa9408
to
c8c3c58
Compare
|
Self merged to solve critical bug. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This should fix the regression from #277642 (comment).
See commit messages for details.
Tests run
nix-build -A nixosTests.nixos-rebuild-target-hostcatches the revert (ie without the fix)nix-build -A nixosTests.nixos-rebuild-target-hoston the second commit shows no regression--build-hostYETThings done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 馃憤 reaction to pull requests you find important.