chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: always write out locally configured settings first, dhcp-acquired ones...
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index 76e642758d5b14e7d532e26e17cf5651b7d0f5e7..a37561a04ada49267a3a9175821582a172c501be 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-1726,6
+1726,10
@@
int link_save(Link *link) {
fputs("DNS=", f);
fputs("DNS=", f);
+ STRV_FOREACH(address, link->network->dns)
+ fprintf(f, "%s%s", *address,
+ (address + 1 ? " " : ""));
+
if (link->network->dhcp_dns &&
link->dhcp_lease) {
const struct in_addr *addresses;
if (link->network->dhcp_dns &&
link->dhcp_lease) {
const struct in_addr *addresses;
@@
-1738,14
+1742,14
@@
int link_save(Link *link) {
}
}
}
}
- STRV_FOREACH(address, link->network->dns)
- fprintf(f, "%s%s", *address,
- (address + 1 ? " " : ""));
-
fputs("\n", f);
fprintf(f, "NTP=");
fputs("\n", f);
fprintf(f, "NTP=");
+ STRV_FOREACH(address, link->network->ntp)
+ fprintf(f, "%s%s", *address,
+ (address + 1 ? " " : ""));
+
if (link->network->dhcp_ntp &&
link->dhcp_lease) {
const struct in_addr *addresses;
if (link->network->dhcp_ntp &&
link->dhcp_lease) {
const struct in_addr *addresses;
@@
-1758,14
+1762,14
@@
int link_save(Link *link) {
}
}
}
}
- STRV_FOREACH(address, link->network->ntp)
- fprintf(f, "%s%s", *address,
- (address + 1 ? " " : ""));
-
fputs("\n", f);
fprintf(f, "DOMAINS=");
fputs("\n", f);
fprintf(f, "DOMAINS=");
+ STRV_FOREACH(domain, link->network->domains)
+ fprintf(f, "%s%s", *domain,
+ (domain + 1 ? " " : ""));
+
if (link->network->dhcp_domains &&
link->dhcp_lease) {
const char *domainname;
if (link->network->dhcp_domains &&
link->dhcp_lease) {
const char *domainname;
@@
-1778,10
+1782,6
@@
int link_save(Link *link) {
}
}
}
}
- STRV_FOREACH(domain, link->network->domains)
- fprintf(f, "%s%s", *domain,
- (domain + 1 ? " " : ""));
-
fputs("\n", f);
fprintf(f, "WILDCARD_DOMAIN=%s\n",
fputs("\n", f);
fprintf(f, "WILDCARD_DOMAIN=%s\n",