Pass NIX_SSHOPTS when checking for an ssh master connection.#8506
Merged
roberth merged 2 commits intoNixOS:masterfrom Jul 18, 2023
Merged
Pass NIX_SSHOPTS when checking for an ssh master connection.#8506roberth merged 2 commits intoNixOS:masterfrom
roberth merged 2 commits intoNixOS:masterfrom
Conversation
This highlights a problem caused by SSHMaster::isMasterRunning returning false when NIX_SSHOPTS contains -oControlPath.
github-actions
bot
added
the
with-tests
Member
|
cc @balsoft |
|
This fixed my issue with rebuilding and deploying for a remote host with on latest nixos-rebuild switch \
--flake '/CONFIGPATH/#HOSTNAME' \
--target-host HOSTNAMEtested with nixosconfig: nix.package = pkgs.nixVersions.nix_2_16.overrideDerivation (oldAttrs: {
patches = [
(pkgs.fetchpatch {
url = " https://patch-diff.githubusercontent.com/raw/NixOS/nix/pull/8506.patch";
sha256 = "sha256-fZXbMoDasvhT9qzcizhxwHe/rlFN9kpahywWqxuNEWQ=";
})
]; |
balsoft
approved these changes
Jul 5, 2023
Member
|
@roberth wdty? |
roberth
approved these changes
Jul 18, 2023
|
Backport failed for Please cherry-pick the changes locally. git fetch origin 2.15-maintenance
git worktree add -d .worktree/backport-8506-to-2.15-maintenance origin/2.15-maintenance
cd .worktree/backport-8506-to-2.15-maintenance
git checkout -b backport-8506-to-2.15-maintenance
ancref=$(git merge-base 041486b11674e0480ad85f63d262c33a09276ef1 d5e1eb20a2712eb17076c3ca2d30e5ac4a351d00)
git cherry-pick -x $ancref..d5e1eb20a2712eb17076c3ca2d30e5ac4a351d00 |
|
Successfully created backport PR for |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin 2.15-maintenance
git worktree add -d .worktree/backport-8506-to-2.15-maintenance origin/2.15-maintenance
cd .worktree/backport-8506-to-2.15-maintenance
git checkout -b backport-8506-to-2.15-maintenance
ancref=$(git merge-base 041486b11674e0480ad85f63d262c33a09276ef1 d5e1eb20a2712eb17076c3ca2d30e5ac4a351d00)
git cherry-pick -x $ancref..d5e1eb20a2712eb17076c3ca2d30e5ac4a351d00 |
|
Git push to origin failed for 2.16-maintenance with exitcode 1 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Motivation
This adds NIX_SSHOPTS to the args when calling
ssh -O check.Context
This should fix #8480.
I'm a little worried about the consequences of this, but the docs don't make any promises about how ssh is called, so I think it's fair to use NIX_SSHOPTS in this way.
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*Priorities
Add 👍 to pull requests you find important.