Updated Branches: refs/heads/4.2 186247d6b -> acd939090 refs/heads/master 467fa6117 -> f37567ef4
CLOUDSTACK-3424 Fixed dhcphosts entry and also dhcp_relase for ipv6 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acd93909 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acd93909 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acd93909 Branch: refs/heads/4.2 Commit: acd9390901493048f6dd0a45800a43be9f9d5412 Parents: 186247d Author: Jayapal <jaya...@apache.org> Authored: Mon Jul 15 18:12:59 2013 +0530 Committer: Jayapal <jaya...@apache.org> Committed: Mon Jul 15 18:14:53 2013 +0530 ---------------------------------------------------------------------- patches/systemvm/debian/config/root/edithosts.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/acd93909/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 2d99586..817d726 100755 --- a/patches/systemvm/debian/config/root/edithosts.sh +++ b/patches/systemvm/debian/config/root/edithosts.sh @@ -96,11 +96,18 @@ wait_for_dnsmasq () { return 1 } -if [ "$ipv4" != '' -a $no_dhcp_release -eq 0 ] +if [ $ipv4 ] +then + ip=$ipv4 +else + ip=$ipv6 +fi + +if [ $no_dhcp_release -eq 0 ] then #release previous dhcp lease if present logger -t cloud "edithosts: releasing $ipv4" - dhcp_release eth0 $ipv4 $(grep $ipv4 $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 + dhcp_release eth0 $ip $(grep $ip $DHCP_LEASES | awk '{print $2}') > /dev/null 2>&1 logger -t cloud "edithosts: released $ipv4" fi @@ -118,7 +125,8 @@ then fi if [ $ipv6 ] then - sed -i /$ipv6,/d $DHCP_HOSTS + #searching with [$ipv6], matching other ip so using $ipv6], + 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
