chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce the concept of AssertXYZ= similar to ConditionXYZ=, but fatal for...
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index fc62395217fd5032a8ae8f331514a4ae8b08c9e6..aad99236c4a4c93c51cb1992ddfa8ebfd87552d2 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-63,15
+63,15
@@
static int network_load_one(Manager *manager, const char *filename) {
LIST_HEAD_INIT(network->static_addresses);
LIST_HEAD_INIT(network->static_routes);
LIST_HEAD_INIT(network->static_addresses);
LIST_HEAD_INIT(network->static_routes);
- network->stacked_netdevs = hashmap_new(
string_hash_func, string_compare_func
);
+ network->stacked_netdevs = hashmap_new(
&string_hash_ops
);
if (!network->stacked_netdevs)
return log_oom();
if (!network->stacked_netdevs)
return log_oom();
- network->addresses_by_section = hashmap_new(NULL
, NULL
);
+ network->addresses_by_section = hashmap_new(NULL);
if (!network->addresses_by_section)
return log_oom();
if (!network->addresses_by_section)
return log_oom();
- network->routes_by_section = hashmap_new(NULL
, NULL
);
+ network->routes_by_section = hashmap_new(NULL);
if (!network->routes_by_section)
return log_oom();
if (!network->routes_by_section)
return log_oom();
@@
-85,6
+85,7
@@
static int network_load_one(Manager *manager, const char *filename) {
network->dhcp_hostname = true;
network->dhcp_routes = true;
network->dhcp_sendhost = true;
network->dhcp_hostname = true;
network->dhcp_routes = true;
network->dhcp_sendhost = true;
+ network->dhcp_route_metric = DHCP_ROUTE_METRIC;
network->llmnr = LLMNR_SUPPORT_YES;
network->llmnr = LLMNR_SUPPORT_YES;