diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:35:10 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-11-28 16:35:10 -0500 |
| commit | ab802648d2d673c0775e8eb8f6f0ea0232ad23bd (patch) | |
| tree | 7d244376ee9fb0267fbc9b5fb103372ba28ad875 | |
| parent | 23b72b08c0e0079ce1c6e6daa5b2a95602290cf3 (diff) | |
Drop systemd patch that doesn't appear to be needed any more
Since there was a systemd fix
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/ubuntu_revert_systemd.patch | 55 |
2 files changed, 0 insertions, 56 deletions
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 7a9cab0b..00000000 --- a/debian/patches/ubuntu_revert_systemd.patch +++ /dev/null @@ -1,55 +0,0 @@ -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(-) - -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 <poll.h> - #include <sys/ioctl.h> - #include <sys/socket.h> --#include <sys/statvfs.h> - #include <unistd.h> - - #include "libnm-glib-aux/nm-c-list.h" -@@ -9830,34 +9829,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, |