diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-06-29 09:14:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2017-06-29 09:21:06 +0000 |
| commit | 6200fe310bc923404bf943a87f0fc75db054f2aa (patch) | |
| tree | bca0304926ed0fd00c634db26c5641308a5b0fff /lib/container/auto | |
| parent | Releasing debian version 20170522-1. (diff) | |
| download | open-infrastructure-compute-tools-6200fe310bc923404bf943a87f0fc75db054f2aa.tar.xz open-infrastructure-compute-tools-6200fe310bc923404bf943a87f0fc75db054f2aa.zip | |
Merging upstream version 20170629.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/auto')
| -rwxr-xr-x | lib/container/auto | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/container/auto b/lib/container/auto index 45aa68f..cbacad2 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -104,7 +104,12 @@ esac for FILE in "${CONFIG}"/*.conf do - if grep -Eqs "^ *cnt.auto=true" "${FILE}" || grep -Eqs "^ *cnt.auto=${HOST}" "${FILE}" + if grep -Eqs "^ *cnt.auto=force-true" "${FILE}" + then + OPTIONS="${OPTIONS} -f" + fi + + if grep -Eqs "^ *cnt.auto=(force-true|true)" "${FILE}" && grep -Eqs "^ *cnt.container-server=${HOST}" "${FILE}" then CONTAINER="$(basename ${FILE} .conf)" |