From 6200fe310bc923404bf943a87f0fc75db054f2aa Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 29 Jun 2017 11:14:50 +0200 Subject: Merging upstream version 20170629. Signed-off-by: Daniel Baumann --- lib/container/auto | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/container/auto') 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)" -- cgit v1.2.3