You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/07/15 15:17:54 UTC
[1/2] git commit: updated refs/heads/master to 6c62175
Updated Branches:
refs/heads/4.2 acd939090 -> ffbc30ddb
refs/heads/master f37567ef4 -> 6c6217594
Revert "CLOUDSTACK-3424 Fixed dhcphosts entry and also dhcp_relase for ipv6"
This reverts commit f37567ef45fe6e41469a176d387e91840bfae23c.
This deletes the duplicate entry when new vm came with deleted vm ip.
So will not fix the bug CLOUDSTACK 3424 fully. So this changes will be committed into new bug
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c621759
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c621759
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c621759
Branch: refs/heads/master
Commit: 6c6217594dead725e951da88b68071f66145e460
Parents: f37567e
Author: Jayapal <ja...@apache.org>
Authored: Mon Jul 15 18:41:08 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Mon Jul 15 18:44:22 2013 +0530
----------------------------------------------------------------------
patches/systemvm/debian/config/root/edithosts.sh | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c621759/patches/systemvm/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/patches/systemvm/debian/config/root/edithosts.sh
index 817d726..2d99586 100755
--- a/patches/systemvm/debian/config/root/edithosts.sh
+++ b/patches/systemvm/debian/config/root/edithosts.sh
@@ -96,18 +96,11 @@ wait_for_dnsmasq () {
return 1
}
-if [ $ipv4 ]
-then
- ip=$ipv4
-else
- ip=$ipv6
-fi
-
-if [ $no_dhcp_release -eq 0 ]
+if [ "$ipv4" != '' -a $no_dhcp_release -eq 0 ]
then
#release previous dhcp lease if present
logger -t cloud "edithosts: releasing $ipv4"
- dhcp_release eth0 $ip $(grep $ip $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
+ dhcp_release eth0 $ipv4 $(grep $ipv4 $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
logger -t cloud "edithosts: released $ipv4"
fi
@@ -125,8 +118,7 @@ then
fi
if [ $ipv6 ]
then
- #searching with [$ipv6], matching other ip so using $ipv6],
- sed -i /$ipv6],/d $DHCP_HOSTS
+ sed -i /$ipv6,/d $DHCP_HOSTS
fi
# don't want to do this in the future, we can have same VM with multiple nics/entries
#sed -i /$host,/d $DHCP_HOSTS
[2/2] git commit: updated refs/heads/4.2 to ffbc30d
Posted by ja...@apache.org.
Revert "CLOUDSTACK-3424 Fixed dhcphosts entry and also dhcp_relase for ipv6"
This reverts commit f37567ef45fe6e41469a176d387e91840bfae23c.
This deletes the duplicate entry when new vm came with deleted vm ip.
So will not fix the bug CLOUDSTACK 3424 fully. So this changes will be committed into new bug
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ffbc30dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ffbc30dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ffbc30dd
Branch: refs/heads/4.2
Commit: ffbc30ddbb8c8023eca717913a446bf8b999e517
Parents: acd9390
Author: Jayapal <ja...@apache.org>
Authored: Mon Jul 15 18:41:08 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Mon Jul 15 18:47:24 2013 +0530
----------------------------------------------------------------------
patches/systemvm/debian/config/root/edithosts.sh | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ffbc30dd/patches/systemvm/debian/config/root/edithosts.sh
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/patches/systemvm/debian/config/root/edithosts.sh
index 817d726..2d99586 100755
--- a/patches/systemvm/debian/config/root/edithosts.sh
+++ b/patches/systemvm/debian/config/root/edithosts.sh
@@ -96,18 +96,11 @@ wait_for_dnsmasq () {
return 1
}
-if [ $ipv4 ]
-then
- ip=$ipv4
-else
- ip=$ipv6
-fi
-
-if [ $no_dhcp_release -eq 0 ]
+if [ "$ipv4" != '' -a $no_dhcp_release -eq 0 ]
then
#release previous dhcp lease if present
logger -t cloud "edithosts: releasing $ipv4"
- dhcp_release eth0 $ip $(grep $ip $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
+ dhcp_release eth0 $ipv4 $(grep $ipv4 $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1
logger -t cloud "edithosts: released $ipv4"
fi
@@ -125,8 +118,7 @@ then
fi
if [ $ipv6 ]
then
- #searching with [$ipv6], matching other ip so using $ipv6],
- sed -i /$ipv6],/d $DHCP_HOSTS
+ sed -i /$ipv6,/d $DHCP_HOSTS
fi
# don't want to do this in the future, we can have same VM with multiple nics/entries
#sed -i /$host,/d $DHCP_HOSTS