openstack/devstack
Code Issues Proposed changes

Merge "Disable non-dhcp resolv.conf"

Browse Source
This commit is contained in:
Jenkins 2013-02-11 18:11:15 +00:00 committed by Gerrit Code Review
commit 098b272cf7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/xen/build_xva.sh
View File

@ -44,12 +44,9 @@ if [ ! -d $STAGING_DIR/etc ]; then
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