1
diff --git a/snap-patch/networkmanager/0004-platform-use-also-statvfs-to-check-for-udevd.patch b/snap-patch/networkmanager/0004-platform-use-also-statvfs-to-check-for-udevd.patch
2
0
new file mode 100644
0
new file mode 100644
3
index 0000000..63e63b2
4
--- /dev/null
5
+++ b/snap-patch/networkmanager/0004-platform-use-also-statvfs-to-check-for-udevd.patch
6
@@ -0,0 +1,72 @@
7
1
From 78f82d0c6a0c2da1cc4d110d366fadb348e143d1 Mon Sep 17 00:00:00 2001
8
2
From: =?UTF-8?q?Alfonso=20S=C3=A1nchez-Beato?=
9
3
 <alfonso.sanchez-beato@canonical.com>
10
4
Date: Tue, 6 Oct 2020 18:30:11 +0200
11
5
Subject: [PATCH] platform: use also statvfs() to check for udevd
12
6
13
7
Check whether or not there is a running udevd by using statvfs() on
14
8
"/sys" and use access() as a fallback. This is in line with what is
15
9
done by systemd [1] and helps in case NM is not really running in a
16
10
container but has been confined by a MAC so it does not have full
17
11
access to sysfs (access() returns EACCES). Fixes LP:#1712918,
18
12
LP:#1893184.
19
13
20
14
Upstream: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/9c8275bedcc98d789fa83d2817b9e8ff58f3e7b6
21
15
22
16
[1] https://github.com/systemd/systemd/blob/v246/src/basic/stat-util.c#L132
23
17
---
24
18
 src/platform/nm-linux-platform.c | 25 ++++++++++++++++++++++++-
25
19
 1 file changed, 24 insertions(+), 1 deletion(-)
26
20
27
21
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
28
22
index 7abe4dfc8..2188caa9b 100644
29
23
--- a/src/platform/nm-linux-platform.c
30
24
+++ b/src/platform/nm-linux-platform.c
31
25
@@ -26,6 +26,7 @@
32
26
 #include <poll.h>
33
27
 #include <sys/ioctl.h>
34
28
 #include <sys/socket.h>
35
29
+#include <sys/statvfs.h>
36
30
 #include <unistd.h>
37
31
 
38
32
 #include "nm-std-aux/unaligned.h"
39
33
@@ -9182,13 +9183,35 @@ constructed (GObject *_object)
40
34
 	}
41
35
 }
42
36
 
43
37
+/* Similar to systemd's path_is_read_only_fs(), at
44
38
+ * https://github.com/systemd/systemd/blob/v246/src/basic/stat-util.c#L132 */
45
39
+static int
46
40
+path_is_read_only_fs(const char *path)
47
41
+{
48
42
+	struct statvfs st;
49
43
+
50
44
+	if (statvfs (path, &st) < 0)
51
45
+		return -errno;
52
46
+
53
47
+	if (st.f_flag & ST_RDONLY)
54
48
+		return TRUE;
55
49
+
56
50
+	/* On NFS, statvfs() might not reflect whether we can actually
57
51
+	 * write to the remote share. Let's try again with
58
52
+	 * access(W_OK) which is more reliable, at least sometimes. */
59
53
+	if (access (path, W_OK) < 0 && errno == EROFS)
60
54
+		return TRUE;
61
55
+
62
56
+	return FALSE;
63
57
+}
64
58
+
65
59
 NMPlatform *
66
60
 nm_linux_platform_new (gboolean log_with_ptr, gboolean netns_support)
67
61
 {
68
62
 	gboolean use_udev = FALSE;
69
63
 
70
64
 	if (   nmp_netns_is_initial ()
71
65
-	    && access ("/sys", W_OK) == 0)
72
66
+	    && path_is_read_only_fs ("/sys") == FALSE)
73
67
 		use_udev = TRUE;
74
68
 
75
69
 	return g_object_new (NM_TYPE_LINUX_PLATFORM,
76
70
-- 
77
71
2.25.1
78
72
79
diff --git a/tests/main/debug-config-option/task.yaml b/tests/main/debug-config-option/task.yaml
80
index 3ffa20e..56faafc 100644
81
--- a/tests/main/debug-config-option/task.yaml
82
+++ b/tests/main/debug-config-option/task.yaml
83
@@ -18,6 +18,10 @@ execute: |
84
18
    test -f /var/snap/network-manager/current/.debug_enabled
18
    test -f /var/snap/network-manager/current/.debug_enabled
85
19
    network-manager.nmcli g log | MATCH "^DEBUG"
19
    network-manager.nmcli g log | MATCH "^DEBUG"
86
20
20
87
21
    # Check that we are using udev (it is a debug only trace)
88
22
    sleep 10
89
23
    journalctl --no-pager -u snap.network-manager.networkmanager.service | MATCH 'use udev'
90
24
91
21
    snap set network-manager debug.enable=false
25
    snap set network-manager debug.enable=false
92
22
    test "$(snap get network-manager debug.enable)" = "false"
26
    test "$(snap get network-manager debug.enable)" = "false"
93
23
    # NM will create the file after being re-started by the hook, wait a bit
27
    # NM will create the file after being re-started by the hook, wait a bit
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2020-10-07
Approved revision:	d084e6fd49660f25ee28dd7820c52279585f7ca9
Merged at revision:	58f8d9915301d74ca03e9c6c41fa553dc4bd9ce6
Proposed branch:	~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-udev-detect
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20
Diff against target:	93 lines (+76/-0) 2 files modified snap-patch/networkmanager/0004-platform-use-also-statvfs-to-check-for-udevd.patch (+72/-0) tests/main/debug-config-option/task.yaml (+4/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2020-10-06	Approve on 2020-10-07
Review via email: mp+391889@code.launchpad.net