From 6c6217594dead725e951da88b68071f66145e460 Mon Sep 17 00:00:00 2001
From: Jayapal <jayapal@apache.org>
Date: Mon, 15 Jul 2013 18:41:08 +0530
Subject: [PATCH] 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
---
 patches/systemvm/debian/config/root/edithosts.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/patches/systemvm/debian/config/root/edithosts.sh
index 817d72640b8..2d995861177 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