This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 23b55dc8d60b562895b233f965c44e62627ab440 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Nov 20 17:33:33 2017 +0530 fix dnsmasq starting issue Signed-off-by: Rohit Yadav <[email protected]> --- systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py | 4 ++-- .../definitions/systemvmtemplate/configure_systemvm_services.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py index da9e616..a2668cf 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py @@ -70,8 +70,8 @@ class CsDhcp(CsDataBag): continue device = i['dev'] ip = i['ip'].split('/')[0] - sline = "dhcp-range=interface:%s,set:interface-%s-%s" % (device, device, idx) - line = "dhcp-range=interface:%s,set:interface-%s-%s,%s,static" % (device, device, idx, ip) + sline = "set:interface-%s-%s" % (device, idx) + line = "set:interface-%s-%s,%s,static" % (device, idx, ip) self.conf.search(sline, line) gn = CsGuestNetwork(device, self.config) sline = "dhcp-option=tag:interface-%s-%s,15" % (device, idx) diff --git a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh index 1386465..3a53b7b 100644 --- a/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh +++ b/tools/appliance/definitions/systemvmtemplate/configure_systemvm_services.sh @@ -129,6 +129,7 @@ function configure_services() { mkdir -p /var/cache/cloud mkdir -p /usr/share/cloud mkdir -p /usr/local/cloud + mkdir -p /opt/tftpboot # Fix haproxy directory issue mkdir -p /var/lib/haproxy -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
