etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-3424 Fixed dhcphosts entry and also dhcp_relase for ipv6" 

This reverts commit f37567ef45.
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
This commit is contained in:
Jayapal 2013-07-15 18:41:08 +05:30
parent acd9390901
commit ffbc30ddbb
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/systemvm/debian/config/root/edithosts.sh
View File

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