Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3eadeb7c3c49
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cb0eb5b2718f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 4, 2018

  1. revert 4a86f8c and properly remove 

    the temporary ssh host keys file/directory.

(cherry picked from commit 95c0534)
    @AmineChikhaoui @rbvermaa
    AmineChikhaoui authored and rbvermaa committed Jun 4, 2018
    Copy the full SHA
    91f7231 View commit details

  2. avoid redundant rm calls 

    (cherry picked from commit 1398d0c)
    @AmineChikhaoui @rbvermaa
    AmineChikhaoui authored and rbvermaa committed Jun 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb0eb5b View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/virtualisation/google-compute-image.nix
2 changes: 1 addition & 1 deletion nixos/modules/virtualisation/google-compute-image.nix
View file
Original file line number Diff line number Diff line change
@@ -257,7 +257,7 @@ in
echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
false
fi
rm -f $SSH_HOST_KEYS_DIR
rm -rf $SSH_HOST_KEYS_DIR
'';
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;