return r;
r = sd_bus_default_system(&m->bus);
- if (r < 0)
+ if (r < 0 && r != -ENOENT) /* TODO: drop when we can rely on kdbus */
return r;
m->udev = udev_new();
if (!m->links)
return -ENOMEM;
- m->bridges = hashmap_new(string_hash_func, string_compare_func);
- if (!m->bridges)
+ m->netdevs = hashmap_new(string_hash_func, string_compare_func);
+ if (!m->netdevs)
return -ENOMEM;
LIST_HEAD_INIT(m->networks);
void manager_free(Manager *m) {
Network *network;
- Bridge *bridge;
+ Netdev *netdev;
Link *link;
udev_monitor_unref(m->udev_monitor);
link_free(link);
hashmap_free(m->links);
- while ((bridge = hashmap_first(m->bridges)))
- bridge_free(bridge);
- hashmap_free(m->bridges);
+ while ((netdev = hashmap_first(m->netdevs)))
+ netdev_free(netdev);
+ hashmap_free(m->netdevs);
sd_rtnl_unref(m->rtnl);
/* update timestamp */
paths_check_timestamp(network_dirs, &m->network_dirs_ts_usec, true);
- r = bridge_load(m);
+ r = netdev_load(m);
if (r < 0)
return r;
int manager_bus_listen(Manager *m) {
int r;
+ assert(m->event);
+
+ if (!m->bus) /* TODO: drop when we can rely on kdbus */
+ return 0;
+
r = sd_bus_attach_event(m->bus, m->event, 0);
if (r < 0)
return r;
Link *link;
Iterator i;
unsigned count = 0;
+ const char *domainname = NULL;
int r;
assert(m);
fchmod(fileno(f), 0644);
- fputs("# This file is managed by systemd-networkd(8). Do not edit.\n", f);
+ fputs("# This file is managed by systemd-networkd(8). Do not edit.\n#\n"
+ "# Third party programs must not access this file directly, but\n"
+ "# only through the symlink at /etc/resolv.conf. To manage\n"
+ "# resolv.conf(5) in a different way, replace the symlink by a\n"
+ "# static file or a different symlink.\n\n", f);
HASHMAP_FOREACH(link, m->links, i) {
if (link->dhcp) {
struct in_addr *nameservers;
size_t nameservers_size;
- r = sd_dhcp_client_get_dns(link->dhcp, &nameservers, &nameservers_size);
- if (r >= 0) {
- unsigned j;
+ if (link->network->dhcp_dns) {
+ r = sd_dhcp_client_get_dns(link->dhcp, &nameservers, &nameservers_size);
+ if (r >= 0) {
+ unsigned j;
+
+ for (j = 0; j < nameservers_size; j++)
+ append_dns(f, &nameservers[j], AF_INET, &count);
+ }
+ }
- for (j = 0; j < nameservers_size; j++)
- append_dns(f, &nameservers[j], AF_INET, &count);
+ if (link->network->dhcp_domainname && !domainname) {
+ r = sd_dhcp_client_get_domainname(link->dhcp, &domainname);
+ if (r >= 0)
+ fprintf(f, "domain %s\n", domainname);
}
}
}