Browse code
Retain resolv.conf as a symlink
Change-Id: Ifabf638716f1e6be9f01664e1077b195fee534bc
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3878
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
suezzelur authored on 2017/09/27 10:45:08Showing 2 changed files
| ... | ... |
@@ -7,13 +7,8 @@ cd / |
| 7 | 7 |
|
| 8 | 8 |
echo "127.0.0.1 localhost" >> /etc/hosts |
| 9 | 9 |
|
| 10 |
-# Update /etc/resolv.conf |
|
| 11 |
-if [ -f /etc/resolv.conf ] |
|
| 12 |
- then |
|
| 13 |
- rm /etc/resolv.conf |
|
| 14 |
-fi |
|
| 15 |
-echo "nameserver 169.254.169.253" >> /etc/resolv.conf |
|
| 16 |
-echo "search ec2.internal" >> /etc/resolv.conf |
|
| 10 |
+echo "DNS=169.254.169.253" >> /etc/systemd/resolved.conf |
|
| 11 |
+echo "Domains=ec2.internal" >> /etc/systemd/network/99-dhcp-en.network |
|
| 17 | 12 |
|
| 18 | 13 |
|
| 19 | 14 |
# Remove ssh host keys and add script to regenerate them at boot time. |
| ... | ... |
@@ -67,4 +62,4 @@ echo 1 > /proc/sys/kernel/modules_disabled |
| 67 | 67 |
if [ -f /boot/system.map* ] |
| 68 | 68 |
then |
| 69 | 69 |
rm /boot/system.map* |
| 70 |
-fi |
|
| 71 | 70 |
\ No newline at end of file |
| 71 |
+fi |
| ... | ... |
@@ -22,12 +22,7 @@ echo "server 169.254.169.254" >> /etc/ntp.conf |
| 22 | 22 |
# Set UTC timezone |
| 23 | 23 |
ln -sf /usr/share/zoneinfo/UTC /etc/localtime |
| 24 | 24 |
|
| 25 |
-# Update /etc/resolv.conf |
|
| 26 |
- |
|
| 27 |
-rm /etc/resolv.conf |
|
| 28 |
- |
|
| 29 |
-echo "nameserver 169.254.169.254" >> /etc/resolv.conf |
|
| 30 |
-echo "nameserver 8.8.8.8" >> /etc/resolv.conf |
|
| 25 |
+echo "DNS=169.254.169.254 8.8.8.8" >> /etc/systemd/resolved.conf |
|
| 31 | 26 |
|
| 32 | 27 |
|
| 33 | 28 |
# Remove ssh host keys and add script to regenerate them at boot time. |