diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-24 21:02:52 +0200 |
| commit | f87c30ac3b55627a166953aec4de552f5a8c5a53 (patch) | |
| tree | 1eb82dba7af28b0504403e2aacaeaf927d14065c /src/settings | |
| parent | bf9fe831a32fc90b956ee777b629adaf6df49d65 (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Update upstream source from tag 'upstream/1.14.4'
Update to upstream version '1.14.4' with Debian dir 3e8398be8782c0495d64cae17094a6b9e5e62907
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/tests/meson.build | 1 | ||||
| -rw-r--r-- | src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/settings/plugins/ifcfg-rh/tests/meson.build index 0593f12d..29bc9699 100644 --- a/src/settings/plugins/ifcfg-rh/tests/meson.build +++ b/src/settings/plugins/ifcfg-rh/tests/meson.build @@ -12,5 +12,6 @@ exe = executable( test( 'ifcfg-rh/' + test_unit, test_script, + timeout: 90, args: test_args + [exe.full_path()] ) diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c index 88c651b8..b66eedc7 100644 --- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -171,7 +171,7 @@ initialize (NMSettingsPlugin *plugin) if (nm_streq (block->type, "iface")) { /* Bridge configuration */ - if (g_str_has_prefix (block_name, "br")) { + if (g_str_has_prefix (block->name, "br")) { /* Try to find bridge ports */ const char *ports = ifparser_getkey (block, "bridge-ports"); |