MT#17673 Bypass deployment.sh debug mode to ngcp-installer (if enabled)

Change-Id: Ia92c3861dc12bd21c6da70a2d09474fab78093cf
changes/66/4966/1
Alexander Lutay 9 years ago
parent 766b8d721a
commit fa36ee89d8

@ -30,6 +30,7 @@ export LANG=C
unset SHELL unset SHELL
# defaults # defaults
DEBUG_MODE=false
DEFAULT_INSTALL_DEV=eth0 DEFAULT_INSTALL_DEV=eth0
DEFAULT_IP1=192.168.255.251 DEFAULT_IP1=192.168.255.251
DEFAULT_IP2=192.168.255.252 DEFAULT_IP2=192.168.255.252
@ -327,14 +328,14 @@ die() {
} }
enable_trace() { enable_trace() {
if checkBootParam debugmode ; then if "${DEBUG_MODE}" ; then
set -x set -x
PS4='+\t ' PS4='+\t '
fi fi
} }
disable_trace() { disable_trace() {
if checkBootParam debugmode ; then if "${DEBUG_MODE}" ; then
set +x set +x
PS4='' PS4=''
fi fi
@ -352,7 +353,10 @@ enable_deploy_status_server
set_deploy_status "checkBootParam" set_deploy_status "checkBootParam"
if checkBootParam debugmode ; then
DEBUG_MODE=true
enable_trace enable_trace
fi
if checkBootParam ngcpstatus ; then if checkBootParam ngcpstatus ; then
STATUS_WAIT=$(getBootParam ngcpstatus || true) STATUS_WAIT=$(getBootParam ngcpstatus || true)
@ -1602,6 +1606,7 @@ SIPWISE_REPO_HOST="${SIPWISE_REPO_HOST}"
SIPWISE_REPO_TRANSPORT="${SIPWISE_REPO_TRANSPORT}" SIPWISE_REPO_TRANSPORT="${SIPWISE_REPO_TRANSPORT}"
NAMESERVER="$(awk '/^nameserver/ {print $2}' /etc/resolv.conf)" NAMESERVER="$(awk '/^nameserver/ {print $2}' /etc/resolv.conf)"
NGCP_PPA="${NGCP_PPA}" NGCP_PPA="${NGCP_PPA}"
DEBUG_MODE="${DEBUG_MODE}"
EOF EOF
cat "${TARGET}/etc/ngcp-installer/config_deploy.inc" > /tmp/ngcp-installer-cmdline.log cat "${TARGET}/etc/ngcp-installer/config_deploy.inc" > /tmp/ngcp-installer-cmdline.log

Loading…
Cancel
Save