From 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 24 Oct 2018 21:01:12 +0200 Subject: New upstream version 1.14.4 --- src/settings/plugins/ifcfg-rh/tests/meson.build | 1 + src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/settings') 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"); -- cgit 1.3.0-6-gf8a5