summaryrefslogtreecommitdiff
path: root/src/network/networkd.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-05 23:01:10 +0100
committerTom Gundersen <teg@jklm.no>2014-01-12 15:37:21 +0100
commit3bef724f7e7f7eaca69881548b06e221b77d7031 (patch)
tree0b17e5a43d7e5c5d07dc696d23d4c829f9ab7200 /src/network/networkd.c
parent924fe4304af981ffd849346b4a1d415f11e9dd79 (diff)
networkd: generate resolv.conf
This adds support to generate a basic resolv.conf in /run/systemd/network. This file will not take any effect unless a symlink is created from /etc/resolv.conf. Nameservers received over DHCP takes precedence over statically configured ones. Note: /etc/resolv.conf is severely limited, so in the future we will likely rather provide a much more powerfull nss plugin (or something to that effect), but this should allow current users to function without any loss of functionality.
Diffstat (limited to 'src/network/networkd.c')
-rw-r--r--src/network/networkd.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 360afba986..055200cb00 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -60,6 +60,13 @@ int main(int argc, char *argv[]) {
if (r < 0)
goto out;
+
+ /* write out empty resolv.conf to avoid a
+ * dangling symlink */
+ r = manager_update_resolv_conf(m);
+ if (r < 0)
+ goto out;
+
sd_notify(false,
"READY=1\n"
"STATUS=Processing requests...");