Skip to content

Commit 87ff9b8

Browse files
committed
CI: adopt NetworkManager to call 'configure'
1 parent c5518d0 commit 87ff9b8

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

.github/workflows/network-manager.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ jobs:
6666
- name: Run autopkgtest
6767
run: |
6868
pull-lp-source network-manager noble
69+
cd network-manager*/
70+
patch src/core/settings/plugins/keyfile/nms-keyfile-utils.c ../.github/workflows/nm-netplan-configure.diff
6971
sudo autopkgtest -U \
7072
--copy=debian/artifacts:/root/ --setup-commands='dpkg -i /root/*.deb' \
7173
--env=DEB_BUILD_OPTIONS=nocheck \
7274
--apt-pocket=proposed=src:network-manager \
73-
network-manager_*.dsc -- lxd autopkgtest/ubuntu/noble/amd64 || test $? -eq 2 # allow for skipped tests (exit code = 2)
75+
. -- lxd autopkgtest/ubuntu/noble/amd64 || test $? -eq 2 # allow for skipped tests (exit code = 2)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
2+
index a91ee6997..5135aed4c 100644
3+
--- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
4+
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
5+
@@ -408,7 +408,7 @@ generate_netplan(const char* rootdir)
6+
* finding a way to pass the --root-dir parameter via DBus, to make it work
7+
* inside NM's unit-tests where netplan needs to read & generate outside of
8+
* /etc/netplan and /run/{systemd,NetworkManager} */
9+
- const gchar *argv[] = { "netplan", "generate", NULL , NULL, NULL };
10+
+ const gchar *argv[] = { "/usr/libexec/netplan/configure", NULL , NULL, NULL };
11+
if (rootdir) {
12+
argv[2] = "--root-dir";
13+
argv[3] = rootdir;

0 commit comments

Comments
 (0)