diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2018-09-10 09:28:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-10 09:28:40 +0200 |
| commit | 462a7adadc615f43edf3817936ebc83fde64aead (patch) | |
| tree | f8058857e1c9c9e7174dd46994c1bbce52d80e23 /container-disc | |
| parent | 68708408abd1d47bb8f5e5a1d80855739b717c2f (diff) | |
| parent | a5a3916318a24d32112266b60510e60fffdb93e9 (diff) | |
Merge pull request #6860 from vespa-engine/revert-6724-revert-6710-hmusum/use-legacy-format-option-for-vespa-get-config
Revert "Revert "Explicitly use legacy format option to vespa-get-config""
Diffstat (limited to 'container-disc')
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index e6219ab0467..21c9dc28022 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -52,7 +52,7 @@ getconfig() { qrstartcfg="`cat ${config_dir}/qr-start.cfg`" ;; *) - qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" + qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -l -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" ;; esac cmds=`echo "$qrstartcfg" | perl -ne 's/^(\w+)\.(\w+) (.*)/$1_$2=$3/ && print'` |