fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-platforms: don't enumerate devices via udev if udevd is not running

Browse source 
We'd be able to do so for already existing devices, but not for devices that
are added afterwards, since gudev is hardwired not to listen for events from
kernel.

(cherry picked from commit 26aeb12749)
This commit is contained in:
Lubomir Rintel 2015-05-11 17:04:11 +02:00 • committed by Thomas Haller
parent 2ba6845a6e
commit faf46ad316
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/platform/nm-linux-platform.c
View file

@ -1118,6 +1118,12 @@ init_link (NMPlatform *platform, NMPlatformLink *info, struct rtnl_link *rtnllin
if (!info->driver)
info->driver = "unknown";
/* Only demand further initialization (udev rules ran, device has
* a stable name now) in case udev is running (not in a container). */
if ( !info->initialized
&& access ("/sys", W_OK) != 0)
info->initialized = TRUE;
return TRUE;
}
@ -4738,11 +4744,7 @@ setup_devices (NMPlatform *platform)
enumerator = g_udev_enumerator_new (priv->udev_client);
g_udev_enumerator_add_match_subsystem (enumerator, "net");
/* Demand that the device is initialized (udev rules ran,
* device has a stable name now) in case udev is running
* (not in a container). */
if (access ("/sys", W_OK) == 0)
g_udev_enumerator_add_match_is_initialized (enumerator);
g_udev_enumerator_add_match_is_initialized (enumerator);
devices = g_udev_enumerator_execute (enumerator);
for (iter = devices; iter; iter = g_list_next (iter)) {