commit ec06efc607328bce9dc535be79e9539d5edec536
author Mate Lakat <mate.lakat@citrix.com> Fri Feb 01 15:16:51 2013 +0000
committer Bob Ball <bob.ball@citrix.com> Fri Feb 08 10:50:34 2013 +0000
tree 17eb878f8ec8081b1148f085596eafabf40575a6
parent f127e2f316f1161bacdf4cccdbc3e56b2b8a54a8

Disable non-dhcp resolv.conf

Fixes: bug #1119268
Change-Id: Icf7d420a31eb7a0cb46b2e59a4328f6b640deb57

tools/xen/build_xva.sh

diff --git a/tools/xen/build_xva.sh b/tools/xen/build_xva.sh
index 0e874cf..b0fd003 100755
--- a/tools/xen/build_xva.sh
+++ b/tools/xen/build_xva.sh
@@ -44,12 +44,9 @@
     exit 1
 fi
 
-# Configure dns (use same dns as dom0)
-# but only when not precise
-if [ "$UBUNTU_INST_RELEASE" != "precise" ]; then
-    cp /etc/resolv.conf $STAGING_DIR/etc/resolv.conf
-elif [ "$MGT_IP" != "dhcp" ] && [ "$PUB_IP" != "dhcp" ]; then
-    echo "Configuration without DHCP not supported on Precise"
+# Only support DHCP for now - don't support how different versions of Ubuntu handle resolv.conf
+if [ "$MGT_IP" != "dhcp" ] && [ "$PUB_IP" != "dhcp" ]; then
+    echo "Configuration without DHCP not supported"
     exit 1
 fi