From 0fb8a25a61a440bb7479c416835d44f1bd888ea3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 11 Dec 2018 12:56:53 +0100 Subject: [PATCH] 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. (cherry picked from commit 3627601bde023e5fc3c55a70025b687d2af20d66) --- contrib/fedora/rpm/00-server-dhcp-client-id.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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