[12/50] git commit: updated refs/heads/vmware-datamodel to 2acbe30

[sa...@apache.org]

CLOUDSTACK-2110 : allow vm to have multiple dhcp entries on same router

Signed-off-by: Marcus Sorensen <ma...@betterservers.com> 1367439056 -0600


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71a17e4c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71a17e4c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71a17e4c

Branch: refs/heads/vmware-datamodel
Commit: 71a17e4c139a5c4e4be326e15548e0d6036dfd9a
Parents: 471ca30
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed May 1 14:10:56 2013 -0600
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed May 1 14:10:56 2013 -0600

----------------------------------------------------------------------
 patches/systemvm/debian/config/root/edithosts.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a17e4c/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 1f98fbf..8609da7 100755
--- a/patches/systemvm/debian/config/root/edithosts.sh
+++ b/patches/systemvm/debian/config/root/edithosts.sh
@@ -113,7 +113,8 @@ if [ $ipv6 ]
 then
   sed -i  /$ipv6,/d $DHCP_HOSTS
 fi
-sed -i  /$host,/d $DHCP_HOSTS
+# don't want to do this in the future, we can have same VM with multiple nics/entries
+#sed -i  /$host,/d $DHCP_HOSTS
 
 
 #put in the new entry