picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

networkd: don't filter on udev tags

Browse source 
This removed the requirement for devices to be tagged with
'systemd-networkd' before they will be visible to networkd.

Still, as by default we don't ship any .network files, network
devices will simply be tracked, but not touched, unless the
admin configures things explicitly.
This commit is contained in:
Tom Gundersen 2013-11-21 15:30:08 +01:00
parent 0b9e3f2cfd
commit 002f5de9a9
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
man/systemd-networkd.service.xml
View file

@ -60,9 +60,6 @@
service that manages networks. It detects and configures
network devices as they appear.</para>
<para>Network devices are managed by networkd only if they
have the udev tag <literal>systemd-networkd</literal>.</para>
<para>Network configurations applied before networkd is started
are not removed, and configuration applied by networkd are not
removed when networkd exits. This ensures restarting networkd

14
src/network/networkd-manager.c
View file

@ -101,6 +101,8 @@ static int manager_process_link(Manager *m, struct udev_device *device) {
if (streq_ptr(udev_device_get_action(device), "remove")) {
uint64_t ifindex;
log_debug("Link removed: %s", udev_device_get_sysname(device));
ifindex = udev_device_get_ifindex(device);
link = hashmap_get(m->links, &ifindex);
if (!link)
@ -108,6 +110,8 @@ static int manager_process_link(Manager *m, struct udev_device *device) {
link_free(link);
} else {
log_debug("New link: %s", udev_device_get_sysname(device));
r = link_add(m, device);
if (r < 0) {
log_error("Could not handle link %s: %s",
@ -136,10 +140,6 @@ int manager_udev_enumerate_links(Manager *m) {
if (r < 0)
goto finish;
r = udev_enumerate_add_match_tag(e, "systemd-networkd");
if (r < 0)
goto finish;
r = udev_enumerate_scan_devices(e);
if (r < 0)
goto finish;
@ -197,12 +197,6 @@ int manager_udev_listen(Manager *m) {
return r;
}
r = udev_monitor_filter_add_match_tag(m->udev_monitor, "systemd-networkd");
if (r < 0) {
log_error("Could not add udev monitor filter: %s", strerror(-r));
return r;
}
r = udev_monitor_enable_receiving(m->udev_monitor);
if (r < 0) {
log_error("Could not enable udev monitor");