From 4ebd2293691d6b6d0e2987d4846dc16ea02b914a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 1 Apr 2020 13:15:45 +0200 Subject: [PATCH] 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. --- .../virtualization/google-compute-engine-oslogin/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 0daa01f85bb..04d222609a6 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -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 ];