You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/09/27 14:11:38 UTC
[19/21] git commit: updated refs/heads/master to 3ded3e9
small cleanups
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d83995e2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d83995e2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d83995e2
Branch: refs/heads/master
Commit: d83995e23c868f6a1b50b4768ba95d3e2d2dbb1e
Parents: a8fa337
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Sep 25 19:17:38 2015 +0200
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Sep 26 20:33:21 2015 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/init.d/cloud-early-config | 2 --
systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d83995e2/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index fec5ecf..79a85e7 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -706,8 +706,6 @@ setup_dnsmasq() {
sed -i -e "s/^dhcp-range_ip6=.*$//" /etc/dnsmasq.conf
fi
- #sed -i -e "s/^[#]*listen-address=.*$/listen-address=$LOCAL_ADDRS/" /etc/dnsmasq.conf
-
if [ "$RROUTER" == "1" ]
then
DEFAULT_GW=$GUEST_GW
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d83995e2/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh b/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
index dcc71ed..d0eb1fc 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh
@@ -100,7 +100,7 @@ if [ $? -eq 0 ]; then
conntrackd -F
conntrackd -k
else
- conntrackd -F
+ conntrackd -F
fi
log_it "VR config: Flushing conntrack table completed"