From 0dc25ff1e0969a08a115f29ffaccc554f222192d Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Thu, 3 Feb 2022 12:02:29 -0500 Subject: Try removing ubuntu_revert_systemd.patch --- debian/patches/series | 1 - debian/patches/ubuntu_revert_systemd.patch | 52 ------------------------------ 2 files changed, 53 deletions(-) delete mode 100644 debian/patches/ubuntu_revert_systemd.patch (limited to 'debian') diff --git a/debian/patches/series b/debian/patches/series index 3be90f06..c2344eb9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,4 +3,3 @@ Force-online-state-with-unmanaged-devices.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch -ubuntu_revert_systemd.patch diff --git a/debian/patches/ubuntu_revert_systemd.patch b/debian/patches/ubuntu_revert_systemd.patch deleted file mode 100644 index 9b1b1e78..00000000 --- a/debian/patches/ubuntu_revert_systemd.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: temporarly revert an upstream commit that made udev enabled under lxc -the new systemd doesn't work there (lp: #1914062) - - -Index: network-manager/src/libnm-platform/nm-linux-platform.c -=================================================================== ---- network-manager.orig/src/libnm-platform/nm-linux-platform.c -+++ network-manager/src/libnm-platform/nm-linux-platform.c -@@ -29,7 +29,6 @@ - #include - #include - #include --#include - #include - - #include "libnm-glib-aux/nm-c-list.h" -@@ -9525,34 +9524,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 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, -- cgit 1.3.0-6-gf8a5