Repository: ambari Updated Branches: refs/heads/trunk 7c1cb60bc -> 9f5f7656c
AMBARI-21133. Configure Ambari Identity fails with "Cannot run program: ambari-sudo.sh" on Ubuntu Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f5f7656 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f5f7656 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f5f7656 Branch: refs/heads/trunk Commit: 9f5f7656c18f722df175dc54cdf6aafdca940ee9 Parents: 7c1cb60 Author: Attila Doroszlai <[email protected]> Authored: Fri May 26 16:36:04 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Mon May 29 07:59:01 2017 +0200 ---------------------------------------------------------------------- ambari-server/conf/unix/ambari-env.sh | 2 +- ambari-server/src/main/python/ambari_server_main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5f7656/ambari-server/conf/unix/ambari-env.sh ---------------------------------------------------------------------- diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh index 33912b6..7c91c85 100644 --- a/ambari-server/conf/unix/ambari-env.sh +++ b/ambari-server/conf/unix/ambari-env.sh @@ -15,7 +15,7 @@ AMBARI_PASSHPHRASE="DEV" -export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false' +export AMBARI_JVM_ARGS="$AMBARI_JVM_ARGS -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false" export PATH=$PATH:$ROOT/var/lib/ambari-server export PYTHONPATH=$PYTHONPATH:$ROOT/usr/lib/python2.6/site-packages http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5f7656/ambari-server/src/main/python/ambari_server_main.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/python/ambari_server_main.py b/ambari-server/src/main/python/ambari_server_main.py index bf4f6d3..de8f317 100644 --- a/ambari-server/src/main/python/ambari_server_main.py +++ b/ambari-server/src/main/python/ambari_server_main.py @@ -184,7 +184,7 @@ def generate_child_process_param_list(ambari_user, java_exe, class_path, # from subprocess, we have to skip --login option of su command. That's why # we change dir to / (otherwise subprocess can face with 'permission denied' # errors while trying to list current directory - cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c 'source {ambari_env_file} ; {command}'".format(ulimit_cmd=ulimit_cmd, + cmd = "{ulimit_cmd} ; {su} {ambari_user} -s {sh_shell} -c '. {ambari_env_file} && {command}'".format(ulimit_cmd=ulimit_cmd, su=locate_file('su', '/bin'), ambari_user=ambari_user, sh_shell=locate_file('sh', '/bin'), command=command, ambari_env_file=AMBARI_ENV_FILE)
