Fixes: bug #1119268
Change-Id: Icf7d420a31eb7a0cb46b2e59a4328f6b640deb57
| ... | ... |
@@ -44,12 +44,9 @@ if [ ! -d $STAGING_DIR/etc ]; then |
| 44 | 44 |
exit 1 |
| 45 | 45 |
fi |
| 46 | 46 |
|
| 47 |
-# Configure dns (use same dns as dom0) |
|
| 48 |
-# but only when not precise |
|
| 49 |
-if [ "$UBUNTU_INST_RELEASE" != "precise" ]; then |
|
| 50 |
- cp /etc/resolv.conf $STAGING_DIR/etc/resolv.conf |
|
| 51 |
-elif [ "$MGT_IP" != "dhcp" ] && [ "$PUB_IP" != "dhcp" ]; then |
|
| 52 |
- echo "Configuration without DHCP not supported on Precise" |
|
| 47 |
+# Only support DHCP for now - don't support how different versions of Ubuntu handle resolv.conf |
|
| 48 |
+if [ "$MGT_IP" != "dhcp" ] && [ "$PUB_IP" != "dhcp" ]; then |
|
| 49 |
+ echo "Configuration without DHCP not supported" |
|
| 53 | 50 |
exit 1 |
| 54 | 51 |
fi |
| 55 | 52 |
|