1
diff --git a/snap-patch/netplan.patch b/snap-patch/netplan.patch
2
0
deleted file mode 100644
0
deleted file mode 100644
3
index 96d35e2..0000000
4
--- a/snap-patch/netplan.patch
5
+++ /dev/null
6
@@ -1,103 +0,0 @@
7
1
From a989fcd2e08c6aa207f2bde2fab1bb7ea273ccf6 Mon Sep 17 00:00:00 2001
8
2
From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= <lukas.maerdian@canonical.com>
9
3
Date: Wed, 5 May 2021 17:07:57 +0200
10
4
Subject: [PATCH] generate: disable generation of non-NM config
11
5
12
6
---
13
7
 src/generate.c | 28 +++++++++++++++-------------
14
8
 1 file changed, 15 insertions(+), 13 deletions(-)
15
9
16
10
diff --git a/src/generate.c b/src/generate.c
17
11
index d820f35..5424316 100644
18
12
--- a/src/generate.c
19
13
+++ b/src/generate.c
20
14
@@ -36,7 +36,7 @@
21
15
 static gchar* rootdir;
22
16
 static gchar** files;
23
17
 static gboolean any_networkd;
24
18
-static gboolean any_sriov;
25
19
+//static gboolean any_sriov;
26
20
 static gchar* mapping_iface;
27
21
 
28
22
 static GOptionEntry options[] = {
29
23
@@ -46,12 +46,14 @@ static GOptionEntry options[] = {
30
24
     {NULL}
31
25
 };
32
26
 
33
27
+/*
34
28
 static void
35
29
 reload_udevd(void)
36
30
 {
37
31
     const gchar *argv[] = { "/sbin/udevadm", "control", "--reload", NULL };
38
32
     g_spawn_sync(NULL, (gchar**)argv, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, NULL, NULL);
39
33
 };
40
34
+*/
41
35
 
42
36
 // LCOV_EXCL_START
43
37
 /* covered via 'cloud-init' integration test */
44
38
@@ -85,13 +87,13 @@ static void
45
39
 nd_iterator_list(gpointer value, gpointer user_data)
46
40
 {
47
41
     NetplanNetDefinition* def = (NetplanNetDefinition*) value;
48
42
-    if (write_networkd_conf(def, (const char*) user_data))
49
43
-        any_networkd = TRUE;
50
44
+    //if (write_networkd_conf(def, (const char*) user_data))
51
45
+    //    any_networkd = TRUE;
52
46
 
53
47
-    write_ovs_conf(def, (const char*) user_data);
54
48
+    //write_ovs_conf(def, (const char*) user_data);
55
49
     write_nm_conf(def, (const char*) user_data);
56
50
-    if (def->sriov_explicit_vf_count < G_MAXUINT || def->sriov_link)
57
51
-        any_sriov = TRUE;
58
52
+    //if (def->sriov_explicit_vf_count < G_MAXUINT || def->sriov_link)
59
53
+    //    any_sriov = TRUE;
60
54
 }
61
55
 
62
56
 
63
57
@@ -223,28 +225,28 @@ int main(int argc, char** argv)
64
58
     }
65
59
 
66
60
     /* Clean up generated config from previous runs */
67
61
-    cleanup_networkd_conf(rootdir);
68
62
+    //cleanup_networkd_conf(rootdir);
69
63
     cleanup_nm_conf(rootdir);
70
64
-    cleanup_ovs_conf(rootdir);
71
65
-    cleanup_sriov_conf(rootdir);
72
66
+    //cleanup_ovs_conf(rootdir);
73
67
+    //cleanup_sriov_conf(rootdir);
74
68
 
75
69
     if (mapping_iface && netdefs)
76
70
         return find_interface(mapping_iface);
77
71
 
78
72
     /* Generate backend specific configuration files from merged data. */
79
73
-    write_ovs_conf_finish(rootdir); // OVS cleanup unit is always written
80
74
+    //write_ovs_conf_finish(rootdir); // OVS cleanup unit is always written
81
75
     if (netdefs) {
82
76
         g_debug("Generating output files..");
83
77
         g_list_foreach (netdefs_ordered, nd_iterator_list, rootdir);
84
78
         write_nm_conf_finish(rootdir);
85
79
-        if (any_sriov) write_sriov_conf_finish(rootdir);
86
80
+        //if (any_sriov) write_sriov_conf_finish(rootdir);
87
81
         /* We may have written .rules & .link files, thus we must
88
82
          * invalidate udevd cache of its config as by default it only
89
83
          * invalidates cache at most every 3 seconds. Not sure if this
90
84
          * should live in `generate' or `apply', but it is confusing
91
85
          * when udevd ignores just-in-time created rules files.
92
86
          */
93
87
-        reload_udevd();
94
88
+        //reload_udevd();
95
89
     }
96
90
 
97
91
     /* Disable /usr/lib/NetworkManager/conf.d/10-globally-managed-devices.conf
98
92
@@ -262,7 +264,7 @@ int main(int argc, char** argv)
99
93
         FILE* f = fopen(generator_run_stamp, "w");
100
94
         g_assert(f != NULL);
101
95
         fclose(f);
102
96
-    } else if (check_called_just_in_time()) {
103
97
+    } else if (FALSE && check_called_just_in_time()) {
104
98
         /* netplan-feature: generate-just-in-time */
105
99
         /* When booting with cloud-init, network configuration
106
100
          * might be provided just-in-time. Specifically after
107
101
-- 
108
102
2.30.2
109
103
110
diff --git a/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch b/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
111
index a9fa763..6dbaf2a 100644
112
--- a/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
113
+++ b/snap-patch/networkmanager/0002-nm-netplan-keyfile.patch
114
@@ -1,7 +1,7 @@
116
1
From e5d3bc03eb28ee09351f947670b3b6608786491e Mon Sep 17 00:00:00 2001
1
From 58fd964ae79bfb635928b839f5788e1face8ddfb Mon Sep 17 00:00:00 2001
117
2
From: Lukas Märdian <lukas.maerdian@canonical.com>
2
From: Lukas Märdian <lukas.maerdian@canonical.com>
118
3
Date: Tue, 2 Feb 2021 15:52:05 +0100
3
Date: Tue, 2 Feb 2021 15:52:05 +0100
120
4
Subject: [PATCH 1/2] netplan: make use of libnetplan for YAML backend
4
Subject: [PATCH] netplan: make use of libnetplan for YAML backend
121
5
5
122
6
This patch modifies NetworkManager's nms-keyfile-plugin in a way to
6
This patch modifies NetworkManager's nms-keyfile-plugin in a way to
123
7
write YAML connections (according to the netplan spec) to
7
write YAML connections (according to the netplan spec) to
124
@@ -27,16 +27,19 @@ Each time the YAML data was modified, NetworkManager calls
125
27
netplan generator can be used as intended (no need for duplicated
27
netplan generator can be used as intended (no need for duplicated
126
28
keyfile export functionality) and the nms-keyfile-writer can be re-used
28
keyfile export functionality) and the nms-keyfile-writer can be re-used
127
29
without any patching needed.
29
without any patching needed.
128
30
129
31
Current upstream repository/branch:
130
32
https://github.com/slyon/NetworkManager/tree/slyon/backend-1.22.10
131
30
---
33
---
141
31
 Makefile.am                                   |  5 +-
34
 Makefile.am                                   |   5 +-
142
32
 meson.build                                   |  3 +
35
 meson.build                                   |   3 +
143
33
 src/meson.build                               |  2 +
36
 src/meson.build                               |   2 +
144
34
 .../plugins/keyfile/nms-keyfile-plugin.c      | 19 ++++
37
 .../plugins/keyfile/nms-keyfile-plugin.c      |  19 +++
145
35
 .../plugins/keyfile/nms-keyfile-utils.c       | 41 ++++++++
38
 .../plugins/keyfile/nms-keyfile-utils.c       |  57 +++++++++
146
36
 .../plugins/keyfile/nms-keyfile-utils.h       |  2 +
39
 .../plugins/keyfile/nms-keyfile-utils.h       |   4 +
147
37
 .../plugins/keyfile/nms-keyfile-writer.c      | 97 +++++++++++++++++++
40
 .../plugins/keyfile/nms-keyfile-writer.c      | 108 ++++++++++++++++++
148
38
 .../keyfile/tests/test-keyfile-settings.c     | 45 +++++++--
41
 .../keyfile/tests/test-keyfile-settings.c     |  45 ++++++--
149
39
 8 files changed, 205 insertions(+), 9 deletions(-)
42
 8 files changed, 234 insertions(+), 9 deletions(-)
150
40
43
151
41
diff --git a/Makefile.am b/Makefile.am
44
diff --git a/Makefile.am b/Makefile.am
152
42
index b37aa4e712311cb23a675af70ec1287fcd3d63f5..2e4e146412de6102068bb953c38cb8091e7f010a 100644
45
index b37aa4e712311cb23a675af70ec1287fcd3d63f5..2e4e146412de6102068bb953c38cb8091e7f010a 100644
153
@@ -89,7 +92,7 @@ index 748fa519bc56305bfe485b9ea1207942fe5b5874..398efb3c69c37bd1d6214602d194dfad
154
89
 
92
 
155
90
 if enable_wext
93
 if enable_wext
156
91
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
94
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
158
92
index fdb88d2a6d6218460fe191d7bc5be08b492886f5..548eda536354c9aa3a305540038bf4a03be8fcb6 100644
95
index fdb88d2a6d6218460fe191d7bc5be08b492886f5..60b8490fdaa7cbf1ffae3dc89f19289bc842acad 100644
159
93
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
96
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
160
94
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
97
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
161
95
@@ -12,6 +12,7 @@
98
@@ -12,6 +12,7 @@
162
@@ -115,7 +118,7 @@ index fdb88d2a6d6218460fe191d7bc5be08b492886f5..548eda536354c9aa3a305540038bf4a0
163
115
 	nm_auto_clear_sett_util_storages NMSettUtilStorages storages_new = NM_SETT_UTIL_STORAGES_INIT (storages_new, nms_keyfile_storage_destroy);
118
 	nm_auto_clear_sett_util_storages NMSettUtilStorages storages_new = NM_SETT_UTIL_STORAGES_INIT (storages_new, nms_keyfile_storage_destroy);
164
116
 	int i;
119
 	int i;
165
117
 
120
 
167
118
+	netplan_generate(NULL);
121
+	generate_netplan(NULL);
168
119
+	_fix_netplan_interface_name(NULL);
122
+	_fix_netplan_interface_name(NULL);
169
120
 	_load_dir (self, NMS_KEYFILE_STORAGE_TYPE_RUN, priv->dirname_run, &storages_new);
123
 	_load_dir (self, NMS_KEYFILE_STORAGE_TYPE_RUN, priv->dirname_run, &storages_new);
170
121
 	if (priv->dirname_etc)
124
 	if (priv->dirname_etc)
171
@@ -140,14 +143,14 @@ index fdb88d2a6d6218460fe191d7bc5be08b492886f5..548eda536354c9aa3a305540038bf4a0
172
140
 
143
 
173
141
+	g_autofree gchar* netplan_id = netplan_get_id_from_nm_filename(previous_filename, ssid);
144
+	g_autofree gchar* netplan_id = netplan_get_id_from_nm_filename(previous_filename, ssid);
174
142
+	netplan_delete_connection(netplan_id, NULL);
145
+	netplan_delete_connection(netplan_id, NULL);
176
143
+	netplan_generate(NULL);
146
+	generate_netplan(NULL);
177
144
+	_fix_netplan_interface_name(NULL);
147
+	_fix_netplan_interface_name(NULL);
178
145
+
148
+
179
146
 	_LOGT ("commit: deleted \"%s\", %s %s (%s%s%s%s)",
149
 	_LOGT ("commit: deleted \"%s\", %s %s (%s%s%s%s)",
180
147
 	       previous_filename,
150
 	       previous_filename,
181
148
 	       storage->is_meta_data ? "meta-data" : "profile",
151
 	       storage->is_meta_data ? "meta-data" : "profile",
182
149
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
152
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
184
150
index f03c601a56a6548c947f1b7cc6d4cd6b441e5b1d..44edabd37599187ee00da2dfea4c3a09fcb2cb9d 100644
153
index f03c601a56a6548c947f1b7cc6d4cd6b441e5b1d..20c3d949b284ba64de0d01794795a1bb6367ba4c 100644
185
151
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
154
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
186
152
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
155
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
187
153
@@ -9,6 +9,7 @@
156
@@ -9,6 +9,7 @@
188
@@ -205,8 +208,28 @@ index f03c601a56a6548c947f1b7cc6d4cd6b441e5b1d..44edabd37599187ee00da2dfea4c3a09
189
205
 const char *
208
 const char *
190
206
 nms_keyfile_nmmeta_check_filename (const char *filename,
209
 nms_keyfile_nmmeta_check_filename (const char *filename,
191
207
                                    guint *out_uuid_len)
210
                                    guint *out_uuid_len)
192
211
@@ -366,3 +407,19 @@ nms_keyfile_utils_check_file_permissions (NMSKeyfileFiletype filetype,
193
212
 	NM_SET_OUT (out_st, st);
194
213
 	return TRUE;
195
214
 }
196
215
+
197
216
+gboolean
198
217
+generate_netplan(const char* rootdir)
199
218
+{
200
219
+	/* TODO: call the io.netplan.Netplan.Generate() DBus method directly, after
201
220
+	 * finding a way to pass the --root-dir parameter via DBus, to make it work
202
221
+	 * inside NM's unit-tests where netplan needs to read & generate outside of
203
222
+	 * /etc/netplan and /run/{systemd,NetworkManager} */
204
223
+	const gchar *argv[] = { "netplan", "generate", NULL , NULL, NULL };
205
224
+	if (rootdir) {
206
225
+		argv[2] = "--root-dir";
207
226
+		argv[3] = rootdir;
208
227
+	}
209
228
+	return g_spawn_sync(NULL, (gchar**)argv, NULL, G_SPAWN_SEARCH_PATH,
210
229
+	                    NULL, NULL, NULL, NULL, NULL, NULL);
211
230
+}
212
208
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
231
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
214
209
index f943d65ca6834efd2bc243397d122243d906712e..f9c29899990ffd70ca4aba50f42284fa2277440f 100644
232
index f943d65ca6834efd2bc243397d122243d906712e..4803135d3f60cdfae4a23640cefcbe6d4f4f1de4 100644
215
210
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
233
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
216
211
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
234
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
217
212
@@ -30,6 +30,8 @@ NMS_KEYFILE_STORAGE_TYPE_LIB (guint run_idx)
235
@@ -30,6 +30,8 @@ NMS_KEYFILE_STORAGE_TYPE_LIB (guint run_idx)
218
@@ -218,8 +241,15 @@ index f943d65ca6834efd2bc243397d122243d906712e..f9c29899990ffd70ca4aba50f42284fa
219
218
 const char *nms_keyfile_nmmeta_check_filename (const char *filename,
241
 const char *nms_keyfile_nmmeta_check_filename (const char *filename,
220
219
                                                guint *out_uuid_len);
242
                                                guint *out_uuid_len);
221
220
 
243
 
222
244
@@ -71,4 +73,6 @@ gboolean nms_keyfile_utils_check_file_permissions (NMSKeyfileFiletype filetype,
223
245
                                                    struct stat *out_st,
224
246
                                                    GError **error);
225
247
 
226
248
+gboolean generate_netplan(const char* rootdir);
227
249
+
228
250
 #endif /* __NMS_KEYFILE_UTILS_H__ */
229
221
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
251
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
231
222
index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7ad49bb00 100644
252
index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..53d8f929921181adbe2b0349ee80d1b93939e829 100644
232
223
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
253
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
233
224
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
254
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
234
225
@@ -11,6 +11,10 @@
255
@@ -11,6 +11,10 @@
235
@@ -241,7 +271,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
236
241
                             GError **error)
271
                             GError **error)
237
242
 {
272
 {
238
243
 	gs_unref_keyfile GKeyFile *kf_file = NULL;
273
 	gs_unref_keyfile GKeyFile *kf_file = NULL;
240
244
@@ -364,6 +369,92 @@ _internal_write_connection (NMConnection *connection,
274
@@ -364,6 +369,103 @@ _internal_write_connection (NMConnection *connection,
241
245
 	    && !nm_streq (path, existing_path))
275
 	    && !nm_streq (path, existing_path))
242
246
 		unlink (existing_path);
276
 		unlink (existing_path);
243
247
 
277
 
244
@@ -278,7 +308,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
245
278
+		 * we've written the /etc/netplan/*.yaml file instead. */
308
+		 * we've written the /etc/netplan/*.yaml file instead. */
246
279
+		unlink(path);
309
+		unlink(path);
247
280
+		g_free(path);
310
+		g_free(path);
249
281
+		if (!netplan_generate(rootdir)) {
311
+		if (!generate_netplan(rootdir)) {
250
282
+			g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
312
+			g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
251
283
+			             "netplan generate failed");
313
+			             "netplan generate failed");
252
284
+			return FALSE;
314
+			return FALSE;
253
@@ -296,6 +326,17 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
254
296
+			else
326
+			else
255
297
+				path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-NM-%s.nmconnection",
327
+				path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-NM-%s.nmconnection",
256
298
+				                       rootdir ?: "", nm_connection_get_uuid (connection));
328
+				                       rootdir ?: "", nm_connection_get_uuid (connection));
257
329
+
258
330
+			// Since netplan v0.103 logical interfaces (bridge/bond/vlan/...) use the interface name as ID
259
331
+			if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
260
332
+				g_free(path);
261
333
+				if (escaped_ssid)
262
334
+					path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-%s-%s.nmconnection",
263
335
+					                       rootdir ?: "", (char *)netdef_id, escaped_ssid);
264
336
+				else
265
337
+					path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-%s.nmconnection",
266
338
+					                       rootdir ?: "", (char *)netdef_id);
267
339
+			}
268
299
+		}
340
+		}
269
300
+
341
+
270
301
+		/* re-read again: this time the connection profile newly generated by netplan in /run/... */
342
+		/* re-read again: this time the connection profile newly generated by netplan in /run/... */
271
@@ -334,7 +375,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
272
334
 	NM_SET_OUT (out_reread, g_steal_pointer (&reread));
375
 	NM_SET_OUT (out_reread, g_steal_pointer (&reread));
273
335
 	NM_SET_OUT (out_reread_same, reread_same);
376
 	NM_SET_OUT (out_reread_same, reread_same);
274
336
 	NM_SET_OUT (out_path, g_steal_pointer (&path));
377
 	NM_SET_OUT (out_path, g_steal_pointer (&path));
276
337
@@ -407,6 +498,7 @@ nms_keyfile_writer_connection (NMConnection *connection,
378
@@ -407,6 +509,7 @@ nms_keyfile_writer_connection (NMConnection *connection,
277
338
 	                                   out_path,
379
 	                                   out_path,
278
339
 	                                   out_reread,
380
 	                                   out_reread,
279
340
 	                                   out_reread_same,
381
 	                                   out_reread_same,
280
@@ -342,7 +383,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
281
342
 	                                   error);
383
 	                                   error);
282
343
 }
384
 }
283
344
 
385
 
285
345
@@ -420,6 +512,10 @@ nms_keyfile_writer_test_connection (NMConnection *connection,
386
@@ -420,6 +523,10 @@ nms_keyfile_writer_test_connection (NMConnection *connection,
286
346
                                     gboolean *out_reread_same,
387
                                     gboolean *out_reread_same,
287
347
                                     GError **error)
388
                                     GError **error)
288
348
 {
389
 {
289
@@ -353,7 +394,7 @@ index fa95198c0084ac6b907f7ffa7ba826a1cca6a025..fb1c0437a45ac0eae9a9fbb6d140abf7
290
353
 	return _internal_write_connection (connection,
394
 	return _internal_write_connection (connection,
291
354
 	                                   FALSE,
395
 	                                   FALSE,
292
355
 	                                   FALSE,
396
 	                                   FALSE,
294
356
@@ -438,5 +534,6 @@ nms_keyfile_writer_test_connection (NMConnection *connection,
397
@@ -438,5 +545,6 @@ nms_keyfile_writer_test_connection (NMConnection *connection,
295
357
 	                                   out_path,
398
 	                                   out_path,
296
358
 	                                   out_reread,
399
 	                                   out_reread,
297
359
 	                                   out_reread_same,
400
 	                                   out_reread_same,
298
@@ -470,74 +511,3 @@ index d2da09da71c45226a8fb5e9f46e376deb5a48be8..fd2aa1424a218ea6a61369da56b9044d
299
470
-- 
511
-- 
300
471
2.32.0
512
2.32.0
301
472
513
302
473
303
474
From 99bd17f98438acb4e9263ef7c1b43b78d955cbcb Mon Sep 17 00:00:00 2001
304
475
From: Lukas Märdian <slyon@ubuntu.com>
305
476
Date: Tue, 5 Oct 2021 11:42:19 +0200
306
477
Subject: [PATCH 2/2] netplan: v0.103 compatibility
307
478
308
479
---
309
480
 src/settings/plugins/keyfile/nms-keyfile-writer.c     | 11 +++++++++++
310
481
 .../plugins/keyfile/tests/test-keyfile-settings.c     | 11 ++++++++---
311
482
 2 files changed, 19 insertions(+), 3 deletions(-)
312
483
313
484
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
314
485
index fb1c0437a45ac0eae9a9fbb6d140abf7ad49bb00..1bc761c4c92ba8df341705630b35a429749b4853 100644
315
486
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
316
487
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
317
488
@@ -420,6 +420,17 @@ _internal_write_connection (NMConnection *connection,
318
489
 			else
319
490
 				path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-NM-%s.nmconnection",
320
491
 				                       rootdir ?: "", nm_connection_get_uuid (connection));
321
492
+
322
493
+			// Since netplan v0.103 logical interfaces (bridge/bond/vlan/...) use the interface name as ID
323
494
+			if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
324
495
+				g_free(path);
325
496
+				if (escaped_ssid)
326
497
+					path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-%s-%s.nmconnection",
327
498
+					                       rootdir ?: "", (char *)netdef_id, escaped_ssid);
328
499
+				else
329
500
+					path = g_strdup_printf("%s/run/NetworkManager/system-connections/netplan-%s.nmconnection",
330
501
+					                       rootdir ?: "", (char *)netdef_id);
331
502
+			}
332
503
 		}
333
504
 
334
505
 		/* re-read again: this time the connection profile newly generated by netplan in /run/... */
335
506
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
336
507
index fd2aa1424a218ea6a61369da56b9044d75232cac..84c7081e941cab54c2027231e1d55065f18633ef 100644
337
508
--- a/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
338
509
+++ b/src/settings/plugins/keyfile/tests/test-keyfile-settings.c
339
510
@@ -461,7 +461,9 @@ test_write_wired_connection (void)
340
511
 	/* Routes */
341
512
 	add_one_ip_route (s_ip4, route1, route1_nh, 24, 3);
342
513
 	add_one_ip_route (s_ip4, route2, route2_nh, 8, 1);
343
514
-	add_one_ip_route (s_ip4, route3, route3_nh, 7, -1);
344
515
+	/* XXX: netplan 0.103 requires "to" and "via" for unicast routes,
345
516
+	 *      but NM drops the "via"/nh field if metric is not defined. */
346
517
+	add_one_ip_route (s_ip4, route3, route3_nh, 7, 0);
347
518
 
348
519
 	rt = nm_ip_route_new (AF_INET, route4, 6, route4_nh, 4, &error);
349
520
 	g_assert_no_error (error);
350
521
@@ -492,14 +494,17 @@ test_write_wired_connection (void)
351
522
 	add_one_ip_route (s_ip6, route6_1, route6_1_nh, 64, 3);
352
523
 	add_one_ip_route (s_ip6, route6_2, route6_2_nh, 56, 1);
353
524
 	add_one_ip_route (s_ip6, route6_3, route6_3_nh, 63, 5);
354
525
-	add_one_ip_route (s_ip6, route6_4, route6_4_nh, 62, -1);
355
526
+	/* XXX: netplan 0.103 requires "to" and "via" for unicast routes,
356
527
+	 *      but NM drops the "via"/nh field if metric is not defined. */
357
528
+	add_one_ip_route (s_ip6, route6_4, route6_4_nh, 62, 0);
358
529
 
359
530
 	/* DNS servers */
360
531
 	nm_setting_ip_config_add_dns (s_ip6, dns6_1);
361
532
 	nm_setting_ip_config_add_dns (s_ip6, dns6_2);
362
533
 
363
534
 	/* DNS searches */
364
535
-	nm_setting_ip_config_add_dns_search (s_ip6, "wallaceandgromit.com");
365
536
+	//XXX: netplan cannot differentiate between IPv4/6 search domains
366
537
+	//nm_setting_ip_config_add_dns_search (s_ip6, "wallaceandgromit.com");
367
538
 
368
539
 	write_test_connection_and_reread (connection, FALSE);
369
540
 }
370
541
-- 
371
542
2.32.0
372
543
373
diff --git a/snap-patch/networkmanager/0005-netplan-use-vendorized-generate-binary.patch b/snap-patch/networkmanager/0005-netplan-use-vendorized-generate-binary.patch
374
544
deleted file mode 100644
514
deleted file mode 100644
375
index 7359624..0000000
376
--- a/snap-patch/networkmanager/0005-netplan-use-vendorized-generate-binary.patch
377
+++ /dev/null
378
@@ -1,83 +0,0 @@
379
1
From ba8d280149cccfd24c7cbb78e8f301edaf4a0cfb Mon Sep 17 00:00:00 2001
380
2
From: Lukas Märdian <slyon@ubuntu.com>
381
3
Date: Thu, 6 May 2021 15:05:33 +0200
382
4
Subject: [PATCH] netplan: use vendorized generate binary
383
5
384
6
---
385
7
 src/settings/plugins/keyfile/nms-keyfile-plugin.c |  4 ++--
386
8
 src/settings/plugins/keyfile/nms-keyfile-utils.c  | 14 ++++++++++++++
387
9
 src/settings/plugins/keyfile/nms-keyfile-utils.h  |  2 ++
388
10
 src/settings/plugins/keyfile/nms-keyfile-writer.c |  2 +-
389
11
 4 files changed, 19 insertions(+), 3 deletions(-)
390
12
391
13
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
392
14
index 548eda536..83bcdb857 100644
393
15
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
394
16
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
395
17
@@ -561,7 +561,7 @@ reload_connections (NMSettingsPlugin *plugin,
396
18
 	nm_auto_clear_sett_util_storages NMSettUtilStorages storages_new = NM_SETT_UTIL_STORAGES_INIT (storages_new, nms_keyfile_storage_destroy);
397
19
 	int i;
398
20
 
399
21
-	netplan_generate(NULL);
400
22
+	_netplan_generate(NULL);
401
23
 	_fix_netplan_interface_name(NULL);
402
24
 	_load_dir (self, NMS_KEYFILE_STORAGE_TYPE_RUN, priv->dirname_run, &storages_new);
403
25
 	if (priv->dirname_etc)
404
26
@@ -1027,7 +1027,7 @@ delete_connection (NMSettingsPlugin *plugin,
405
27
 
406
28
 	g_autofree gchar* netplan_id = netplan_get_id_from_nm_filename(previous_filename, ssid);
407
29
 	netplan_delete_connection(netplan_id, NULL);
408
30
-	netplan_generate(NULL);
409
31
+	_netplan_generate(NULL);
410
32
 	_fix_netplan_interface_name(NULL);
411
33
 
412
34
 	_LOGT ("commit: deleted \"%s\", %s %s (%s%s%s%s)",
413
35
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
414
36
index 44edabd37..e2030ec5c 100644
415
37
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
416
38
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
417
39
@@ -407,3 +407,17 @@ nms_keyfile_utils_check_file_permissions (NMSKeyfileFiletype filetype,
418
40
 	NM_SET_OUT (out_st, st);
419
41
 	return TRUE;
420
42
 }
421
43
+
422
44
+gboolean
423
45
+_netplan_generate(const char* rootdir)
424
46
+{
425
47
+    /* Use 'netplan_generate()' from libnetplan once that is fixed to not be
426
48
+     * DENIED by apparmor via snapd's 'network-setup-control' interface.
427
49
+     * This needs https://github.com/snapcore/snapd/pull/10212 to be landed. */
428
50
+    const gchar *argv[] = { "/snap/network-manager/current/lib/netplan/generate", NULL , NULL, NULL };
429
51
+    if (rootdir) {
430
52
+        argv[1] = "--root-dir";
431
53
+        argv[2] = rootdir;
432
54
+    }
433
55
+    return g_spawn_sync(NULL, (gchar**)argv, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
434
56
+}
435
57
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
436
58
index f9c298999..16b965ffd 100644
437
59
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
438
60
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
439
61
@@ -73,4 +73,6 @@ gboolean nms_keyfile_utils_check_file_permissions (NMSKeyfileFiletype filetype,
440
62
                                                    struct stat *out_st,
441
63
                                                    GError **error);
442
64
 
443
65
+gboolean _netplan_generate(const char* rootdir);
444
66
+
445
67
 #endif /* __NMS_KEYFILE_UTILS_H__ */
446
68
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
447
69
index 1bc761c4c..022eebce9 100644
448
70
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
449
71
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
450
72
@@ -402,7 +402,7 @@ _internal_write_connection (NMConnection *connection,
451
73
 		 * we've written the /etc/netplan/*.yaml file instead. */
452
74
 		unlink(path);
453
75
 		g_free(path);
454
76
-		if (!netplan_generate(rootdir)) {
455
77
+		if (!_netplan_generate(rootdir)) {
456
78
 			g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_FAILED,
457
79
 			             "netplan generate failed");
458
80
 			return FALSE;
459
81
-- 
460
82
2.32.0
461
83
462
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
463
index b214e02..f5701f3 100644
464
--- a/snap/snapcraft.yaml
465
+++ b/snap/snapcraft.yaml
466
@@ -23,14 +23,6 @@ grade: stable
467
23
# will be adjusted accordingly.
23
# will be adjusted accordingly.
468
24
epoch: 1
24
epoch: 1
469
25
25
470
26
# Some packages might land in the ubuntu-image PPA for making their way
471
27
# into a Ubuntu Core base image and only later land in a LTS release.
472
28
# Enable ubuntu-image PPA once the --enable-experimental-package-repositories
473
29
# flag is not needed anymore
474
30
# package-repositories:
475
31
#   - type: apt
476
32
#     ppa: canonical-foundations/ubuntu-image
477
33
478
34
slots:
26
slots:
479
35
  service: network-manager
27
  service: network-manager
480
36
28
481
@@ -152,29 +144,6 @@ parts:
482
152
    prime:
144
    prime:
483
153
      - $binaries
145
      - $binaries
484
154
146
485
155
  netplan:
486
156
    after: [ stack-snaps-tools ]
487
157
    plugin: make
488
158
    source: https://git.launchpad.net/ubuntu/+source/netplan.io
489
159
    source-type: git
490
160
    source-tag: applied/0.102-0ubuntu1_20.04.2
491
161
    build-packages:
492
162
      - build-essential
493
163
      - libyaml-dev
494
164
      - libglib2.0-dev
495
165
      - uuid-dev
496
166
      - libsystemd-dev
497
167
      - pandoc
498
168
    override-build: |
499
169
      set -ex
500
170
      git apply "$SNAPCRAFT_PROJECT_DIR"/snap-patch/netplan.patch
501
171
      snapcraftctl build
502
172
    filesets:
503
173
      binaries:
504
174
        - lib/netplan/generate
505
175
    prime:
506
176
      - $binaries
507
177
508
178
  networkmanager:
147
  networkmanager:
509
179
    after: [ stack-snaps-tools ]
148
    after: [ stack-snaps-tools ]
510
180
    plugin: autotools
149
    plugin: autotools
511
@@ -220,7 +189,6 @@ parts:
512
220
      - libnetplan-dev
189
      - libnetplan-dev
513
221
      - netplan.io
190
      - netplan.io
514
222
      - libyaml-dev
191
      - libyaml-dev
515
223
      - software-properties-common # Can be removed once "package-repositories:" is working
516
224
    autotools-configure-parameters:
192
    autotools-configure-parameters:
517
225
      - --prefix=/usr
193
      - --prefix=/usr
518
226
      - --sysconfdir=/etc
194
      - --sysconfdir=/etc
519
@@ -280,11 +248,15 @@ parts:
520
280
      ./autogen.sh
248
      ./autogen.sh
521
281
      snapcraftctl build
249
      snapcraftctl build
522
282
250
523
283
      # Simulate vendorized netplan generator binary to pass tests
524
284
      mkdir -p /snap/network-manager/current/lib/netplan
525
285
      ln -sf /lib/netplan/generate /snap/network-manager/current/lib/netplan/generate
526
286
      # Run all tests NetworkManager ships by default
251
      # Run all tests NetworkManager ships by default
527
252
      # Hide the $SNAP env variable during testing, to prevent the netplan CLI
528
253
      # from using the snap fallback io.netplan.Netplan.Generate() DBus API as
529
254
      # that does not allow to pass a --root-dir argument, needed for testing
530
255
      _SNAP=$SNAP
531
256
      unset SNAP
532
287
      make check
257
      make check
533
258
      SNAP=$_SNAP
534
259
      unset _SNAP
535
288
    stage-packages:
260
    stage-packages:
536
289
      - iputils-arping
261
      - iputils-arping
537
290
      - libasn1-8-heimdal
262
      - libasn1-8-heimdal
Status:	Merged
Approved by:	Alfonso Sanchez-Beato on 2022-02-03
Approved revision:	b30293022f595124fe8cebd6e6ac3f17f3ea84d8
Merged at revision:	ecc97bad2af908d74162d16b0efc2e67b4b1d01a
Proposed branch:	~slyon/snappy-hwe-snaps/+git/network-manager:slyon/drop-vendorized-netplan
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:snap-20
Diff against target:	537 lines (+70/-211) 3 files modified dev/null (+0/-83) snap-patch/networkmanager/0002-nm-netplan-keyfile.patch (+63/-93) snap/snapcraft.yaml (+7/-35)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
System Enablement Bot	continuous-integration	2021-12-01	Approve on 2022-02-03
Alfonso Sanchez-Beato		2022-01-26	Approve on 2022-01-27
Review via email: mp+412634@code.launchpad.net