Commit d485271f authored by Jérome Perrin's avatar Jérome Perrin Committed by Rafael Monnerat

slaprunner: set $SHELL to use slaprunner bash as a shell

For consistency and because mosh uses $SHELL and otherwise would use the
system shell ( /bin/sh )
parent 6d9096e6
......@@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab
[template-runner]
filename = instance-runner.cfg
md5sum = 75cb4012edf3f968d5be24ebaf4c45f8
md5sum = 1fc2697fe262591db0a6039c47b115c7
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......@@ -63,7 +63,7 @@ md5sum = f8446fcf254b4929eb828a9a1d7e5f62
[template-bash-profile]
filename = template/bash_profile.in
md5sum = 1c88cbca0c1e705eeb4b544ef4616097
md5sum = 91627d14efea97d301e297e8e724fa1d
[template-supervisord]
filename = template/supervisord.conf.in
......
......@@ -226,7 +226,7 @@ template = inline:
PasswordAuthentication no
PubkeyAuthentication yes
AuthorizedKeysFile $${buildout:directory}/.ssh/authorized_keys
ForceCommand if [ -z "$SSH_ORIGINAL_COMMAND" ]; then $${shell-environment:shell} -l; else PATH=$${shell-environment:path} eval "$SSH_ORIGINAL_COMMAND"; fi
ForceCommand if [ -z "$SSH_ORIGINAL_COMMAND" ]; then $${shell-environment:shell} -l; else SHELL=$${shell-environment:shell} PATH=$${shell-environment:path} eval "$SSH_ORIGINAL_COMMAND"; fi
Subsystem sftp ${openssh:location}/libexec/sftp-server
[runner-sshd-raw-server]
......@@ -706,6 +706,7 @@ template = ${template-bash-profile:location}/${template-bash-profile:filename}
rendered = $${buildout:directory}/.bash_profile
context =
raw path $${shell-environment:path}
raw shell $${shell-environment:shell}
key workdir runnerdirectory:home
#---------------------------
......
......@@ -4,6 +4,7 @@
cd {{ workdir }}
export PATH={{- path }}
export SHELL={{- shell }}
export PS1="$ "
if [ -f "$HOME/.bashrc" ] ; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment