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: 5e37578dd943
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e1da6c158fd1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 1, 2020

  1. google-compute-engine-oslogin: fix bash reference 

    This is the bash that is being called when logging into the VM. This
fixes prompt escaping issues and also restores tab completion to the
logged-in user.
    @zimbatm
    zimbatm committed Apr 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    vszakats Viktor Szakats
    GPG key ID: B5ABD165E2AEF201
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4ebd229 View commit details

  2. Merge pull request #83960 from zimbatm/google-compute-engine-oslogin-fix 

    google-compute-engine-oslogin: fix bash reference
    @flokli
    flokli authored Apr 1, 2020
    Copy the full SHA
    e1da6c1 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
3 changes: 2 additions & 1 deletion pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
, curl
, json_c
, pam
, bashInteractive
}:

stdenv.mkDerivation rec {
@@ -22,7 +23,7 @@ stdenv.mkDerivation rec {
# change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles)
substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d
# fix "User foo not allowed because shell /bin/bash does not exist"
substituteInPlace compat.h --replace /bin/bash ${stdenv.shell}
substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash
'';

buildInputs = [ curl.dev pam ];