public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

google-compute-engine-oslogin: fix bash reference
This commit is contained in:
Florian Klink 2020-04-01 14:01:17 +02:00 committed by GitHub
parent 5e37578dd9 4ebd229369
commit e1da6c158f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix
View File

@ -3,6 +3,7 @@
, curl , curl
, json_c , json_c
, pam , pam
, bashInteractive
}: }:
stdenv.mkDerivation rec { 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) # 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 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" # 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 ]; buildInputs = [ curl.dev pam ];