chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bbf261b
)
networkd: fix setting dns from dhcp
author
Tom Gundersen
<teg@jklm.no>
Mon, 10 Feb 2014 10:53:16 +0000
(11:53 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 10 Feb 2014 10:53:20 +0000
(11:53 +0100)
src/network/networkd-link.c
patch
|
blob
|
history
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index 867baa6dee78a8f2adf3b19a039726e28f42b957..6468f9cd3160d1409d828c34856a9ef8350c8bcc 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-562,6
+562,8
@@
static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
ADDRESS_FMT_VAL(gateway),
NULL);
+ link->dhcp_lease = lease;
+
if (link->network->dhcp_dns) {
r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size);
if (r >= 0) {
@@
-595,8
+597,6
@@
static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
}
}
- link->dhcp_lease = lease;
-
link_enter_set_addresses(link);
return 0;