On Tue, Sep 29, 2020 at 02:57:50PM +0800, Yu Chuan wrote:
The custom dnsmasq conf files should be placed under the follow dir: /etc/compass-ci/dnsmasq.d/
Signed-off-by: Yu Chuan <13186087857@163.com> --- container/dnsmasq/start | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/container/dnsmasq/start b/container/dnsmasq/start index 3cad801ec81c..8e0e05c953fb 100755 --- a/container/dnsmasq/start +++ b/container/dnsmasq/start @@ -8,6 +8,10 @@ docker_rm dnsmasq
kill $(ps -ef| grep dnsmasq| grep libvirt| awk '{print $2}') 2> /dev/null
+# load custom dnsmasq.conf +[ -d "/etc/compass-ci/dnsmasq.d/" ] && + cp /etc/compass-ci/dnsmasq.d/* ${PWD}/dnsmasq.d/
i feel $PWD is not safe. if the scripy called under /home/xxx the $PWD is /home/xxx Thanks, Shenwei
+ cmd=( docker run --restart=always -- 2.23.0