Commit 81641e8b authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm play: don't export SUDO to play.d script, don't export EPM_AUTO and set auto for it

parent 7b225cb2
...@@ -146,14 +146,8 @@ __epm_play_run() ...@@ -146,14 +146,8 @@ __epm_play_run()
local script="$psdir/$1.sh" local script="$psdir/$1.sh"
shift shift
local addopt
set_sudo addopt="$dryrun $non_interactive"
export SUDO
# keep EPM_AUTO for non epm code (epm uses EPM_OPTIONS now)
[ -n "$non_interactive" ] && export EPM_AUTO="--auto"
export EPM_OPTIONS="$EPM_OPTIONS $dryrun"
local bashopt='' local bashopt=''
[ -n "$verbose" ] && bashopt='-x' [ -n "$verbose" ] && bashopt='-x'
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# kind of hack: inheritance --force from main epm # kind of hack: inheritance --force from main epm
echo "$EPM_OPTIONS" | grep -q -- "--force" && force="--force" echo "$EPM_OPTIONS" | grep -q -- "--force" && force="--force"
echo "$EPM_OPTIONS" | grep -q -- "--auto" && auto="--auto"
fatal() fatal()
{ {
......
...@@ -40,7 +40,7 @@ case "$(epm print info -d)" in ...@@ -40,7 +40,7 @@ case "$(epm print info -d)" in
;; ;;
esac esac
if [ -z "$EPM_AUTO" ] ; then if [ -z "$auto" ] ; then
esu /opt/mssql/bin/mssql-conf setup accept-eula esu /opt/mssql/bin/mssql-conf setup accept-eula
serv mssql-server on serv mssql-server on
else else
......
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