maas-deployer

Merge lp:~nobuto/maas-deployer/fix-resolvconf into lp:~maas-deployers/maas-deployer/next

  1. fix-resolvconf
  2. Merge into next
Proposed by Nobuto Murata
Status: Merged
Merged at revision: 22
Proposed branch: lp:~nobuto/maas-deployer/fix-resolvconf
Merge into: lp:~maas-deployers/maas-deployer/next
Diff against target: 16 lines (+1/-2)
1 file modified
maas_deployer/vmaas/templates/config-maas.sh (+1/-2)
To merge this branch: bzr merge lp:~nobuto/maas-deployer/fix-resolvconf
Reviewer Review Type Date Requested Status
MAAS Deployers Pending
Review via email: mp+268485@code.launchpad.net

Description of the change

properly clean up /etc/resolv.conf, LP: #1480263

/etc/resolv.conf will be left as empty until the next reboot, but it
uses local nameserver, i.e. MAAS DNS. From the manpage of
resolv.conf(5):
> If no nameserver entries are present, the default is to use the name
> server on the local machine.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'maas_deployer/vmaas/templates/config-maas.sh'
2--- maas_deployer/vmaas/templates/config-maas.sh 2015-07-23 16:20:28 +0000
3+++ maas_deployer/vmaas/templates/config-maas.sh 2015-08-19 14:05:30 +0000
4@@ -14,11 +14,10 @@
5 # Configure the dns nameservers
6 echo "Configuring the DNS nameserver"
7 for dev in `ip link show | grep eth.*mtu | cut -d':' -f2`; do
8- sudo resolvconf -d $dev
9+ sudo resolvconf -d ${dev}.inet
10 done
11
12 sudo sed -i 's/dns-nameserver.*/dns-nameserver 127.0.0.1/g' /etc/network/interfaces
13-sudo resolvconf -u
14
15
16 # Generate a MAAS API key for the admin user and start the importing of boot resources.

Subscribers

People subscribed via source and target branches

to all changes: