From 5e3e3a7a1c51f434e1991a1527705483c5c24659 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 23 Jul 2012 16:09:59 -0700 Subject: [PATCH] CS-15635 : fixed the part introduced by VPC, there is anther part needs to be fixed for regular network --- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh index c09e2938f2b..35394646854 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh @@ -78,18 +78,6 @@ setup_dnsmasq() { # setup static sed -i -e "/^[#]*dhcp-range=interface:$dev/d" /etc/dnsmasq.d/cloud.conf echo "dhcp-range=interface:$dev,set:interface-$dev,$ip,static" >> /etc/dnsmasq.d/cloud.conf - # setup gateway - sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,option:router.*$/d" /etc/dnsmasq.d/cloud.conf - if [ -n "$gw" ] - then - echo "dhcp-option=tag:interface-$dev,option:router,$gw" >> /etc/dnsmasq.d/cloud.conf - fi - # setup DNS - sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,6.*$/d" /etc/dnsmasq.d/cloud.conf - if [ -n "$gw" ] - then - echo "dhcp-option=tag:interface-$dev,6,$gw" >> /etc/dnsmasq.d/cloud.conf - fi # setup DOMAIN [ -z $DOMAIN ] && DOMAIN="cloudnine.internal"