From bfe2e67f258695c768572350f8fac747aef8d681 Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Wed, 8 Jun 2022 15:53:30 -0400 Subject: [PATCH 1/2] libsystemd-network: use udev_available() --- src/libsystemd-network/dhcp-identifier.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c index d2b190244f..326b09ac5e 100644 --- a/src/libsystemd-network/dhcp-identifier.c +++ b/src/libsystemd-network/dhcp-identifier.c @@ -11,7 +11,6 @@ #include "netif-util.h" #include "siphash24.h" #include "sparse-endian.h" -#include "stat-util.h" #include "string-table.h" #include "udev-util.h" @@ -213,7 +212,7 @@ int dhcp_identifier_set_iaid( uint64_t id; int r; - if (path_is_read_only_fs("/sys") <= 0 && !use_mac) { + if (udev_available() && !use_mac) { /* udev should be around */ r = sd_device_new_from_ifindex(&device, ifindex); From c76b8751b3b4b96a256533699413ad5a2f4058e3 Mon Sep 17 00:00:00 2001 From: Nick Rosbrook Date: Wed, 8 Jun 2022 15:53:45 -0400 Subject: [PATCH 2/2] nspawn: use udev_available() --- src/nspawn/nspawn-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index f3d7f403f9..536e369231 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -468,7 +468,7 @@ int test_network_interface_initialized(const char *name) { _cleanup_(sd_device_unrefp) sd_device *d = NULL; int r; - if (path_is_read_only_fs("/sys") > 0) + if (!udev_available()) return 0; /* udev should be around. */