You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2014/03/14 21:40:00 UTC
[1/2] git commit: updated refs/heads/4.3-forward to e406adc
Repository: cloudstack
Updated Branches:
refs/heads/4.3-forward 94817c1b4 -> e406adc08
CLOUDSTACK-5986: Fix dnsmasq lease for VPC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/657d0429
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/657d0429
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/657d0429
Branch: refs/heads/4.3-forward
Commit: 657d042953e40e3220c5b0b86511f3bf6a1e186f
Parents: 94817c1
Author: Sheng Yang <sh...@citrix.com>
Authored: Wed Mar 12 18:02:31 2014 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Mar 14 13:38:42 2014 -0700
----------------------------------------------------------------------
systemvm/patches/debian/config/root/edithosts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/657d0429/systemvm/patches/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh
index 8e7ddac..d6ff983 100755
--- a/systemvm/patches/debian/config/root/edithosts.sh
+++ b/systemvm/patches/debian/config/root/edithosts.sh
@@ -95,7 +95,7 @@ wait_for_dnsmasq () {
return 1
}
-if [ $dnsmasq_managed_lease ]
+if [ $dnsmasq_managed_lease -eq 1 ]
then
#release previous dhcp lease if present
logger -t cloud "edithosts: releasing $ipv4"
@@ -212,7 +212,7 @@ pid=$(pidof dnsmasq)
if [ "$pid" != "" ]
then
# use SIGHUP to avoid service outage if dhcp_release is available.
- if [ $dnsmasq_managed_lease ]
+ if [ $dnsmasq_managed_lease -eq 1 ]
then
kill -HUP $pid
else
[2/2] git commit: updated refs/heads/4.3-forward to e406adc
Posted by ya...@apache.org.
CLOUDSTACK-6241: Fix default route for IPv6 network when IPv4 not used
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e406adc0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e406adc0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e406adc0
Branch: refs/heads/4.3-forward
Commit: e406adc0810b22ded0964080946f019be1337b52
Parents: 657d042
Author: Sheng Yang <sh...@citrix.com>
Authored: Fri Mar 14 13:36:43 2014 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Fri Mar 14 13:39:17 2014 -0700
----------------------------------------------------------------------
systemvm/patches/debian/config/root/edithosts.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e406adc0/systemvm/patches/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh
index d6ff983..57ee7dc 100755
--- a/systemvm/patches/debian/config/root/edithosts.sh
+++ b/systemvm/patches/debian/config/root/edithosts.sh
@@ -184,7 +184,7 @@ then
echo "$ipv6 $host" >> $HOSTS
fi
-if [ "$dflt" != "" ]
+if [ "$dflt" != "" -a "$ipv4" != "" ]
then
#make sure dnsmasq looks into options file
sed -i /dhcp-optsfile/d /etc/dnsmasq.conf