Description: temporarly revert an upstream commit that made udev enabled under lxc the new systemd doesn't work there (lp: #1914062) --- src/libnm-platform/nm-linux-platform.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/libnm-platform/nm-linux-platform.c b/src/libnm-platform/nm-linux-platform.c index 78df53e..2f3d852 100644 --- a/src/libnm-platform/nm-linux-platform.c +++ b/src/libnm-platform/nm-linux-platform.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "libnm-glib-aux/nm-c-list.h" @@ -9598,34 +9597,12 @@ constructed(GObject *_object) } } -/* Similar to systemd's path_is_read_only_fs(), at - * https://github.com/systemd/systemd/blob/v246/src/basic/stat-util.c#L132 */ -static int -path_is_read_only_fs(const char *path) -{ - struct statvfs st; - - if (statvfs(path, &st) < 0) - return -errno; - - if (st.f_flag & ST_RDONLY) - return TRUE; - - /* On NFS, statvfs() might not reflect whether we can actually - * write to the remote share. Let's try again with - * access(W_OK) which is more reliable, at least sometimes. */ - if (access(path, W_OK) < 0 && errno == EROFS) - return TRUE; - - return FALSE; -} - NMPlatform * nm_linux_platform_new(gboolean log_with_ptr, gboolean netns_support, gboolean cache_tc) { gboolean use_udev = FALSE; - if (nmp_netns_is_initial() && path_is_read_only_fs("/sys") == FALSE) + if (nmp_netns_is_initial() && access("/sys", W_OK) == 0) use_udev = TRUE; return g_object_new(NM_TYPE_LINUX_PLATFORM,