Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6303d4ecf775
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e966dc16743
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 16, 2017

  1. ssh: Add Newline to KnownHostsText 

    SSH expects a new line at the end of known_hosts file.
Without a new line the next entry goes on the same line
as the last entry in known_hosts causing errors.
    @jammerful
    jammerful committed May 16, 2017
    Copy the full SHA
    d9df350 View commit details

  2. Merge pull request #25818 from jammerful/ssh 

    ssh: Add Newline to KnownHostsText
    @falsifian
    falsifian authored May 16, 2017
    Copy the full SHA
    2e966dc View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/programs/ssh.nix
4 changes: 2 additions & 2 deletions nixos/modules/programs/ssh.nix
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ let

knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);

knownHostsText = flip (concatMapStringsSep "\n") knownHosts
knownHostsText = (flip (concatMapStringsSep "\n") knownHosts
(h: assert h.hostNames != [];
concatStringsSep "," h.hostNames + " "
+ (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
);
)) + "\n";

in
{