summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-12-11 12:56:53 +0100
committerThomas Haller <thaller@redhat.com>2018-12-11 14:01:41 +0100
commit3627601bde023e5fc3c55a70025b687d2af20d66 (patch)
treeaf255ad7909666630b8997e6e4e2ff968ae357fe
parenta7ef23b326f1163adbe3b573ce78d71bfb186c1f (diff)
downloadNetworkManager-3627601bde023e5fc3c55a70025b687d2af20d66.tar.gz
contrib/rpm: adjust match-device spec for 00-server-dhcp-client-id.conf
For older NetworkManager versions, a match spec that only contained except: specifiers could never yield a positive match. That is not very useful and got fixed by commit 242de347adbf653a709607979d36a0da1ca3ff0b (core: fix device spec matching for a list of "except:"). Still, adjust the configuration snippet so that it also works with configurations that predate the fix.
-rw-r--r--contrib/fedora/rpm/00-server-dhcp-client-id.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/00-server-dhcp-client-id.conf b/contrib/fedora/rpm/00-server-dhcp-client-id.conf
index afaf0ca9a1..0cd3cd7167 100644
--- a/contrib/fedora/rpm/00-server-dhcp-client-id.conf
+++ b/contrib/fedora/rpm/00-server-dhcp-client-id.conf
@@ -2,5 +2,5 @@
# But don't do so for dhclient DHCP plugin, as the default of dhclient may
# be specified via /etc/dhcp (and anyway defaults to "hardware" already).
[connection-00-server-dhcp-client-id]
-match-device=except:dhcp-plugin:dhclient
+match-device=*,except:dhcp-plugin:dhclient
ipv4.dhcp-client-id=mac