CLOUDSTACK-3424 Fixed dhcphosts entry and also dhcp_relase for ipv6

This commit is contained in:
Jayapal 2013-07-15 18:12:59 +05:30
parent 467fa6117e
commit f37567ef45

View File

@ -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