From daf935fb1baa946c18aa6f5bee23c4a3b61e66cd Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 17 Jan 2017 14:23:47 +0100 Subject: [PATCH] contrib/rpm: fix code comment in default "NetworkManager.conf" --- contrib/fedora/rpm/NetworkManager.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.conf b/contrib/fedora/rpm/NetworkManager.conf index a66f370a1e..1979ea6878 100644 --- a/contrib/fedora/rpm/NetworkManager.conf +++ b/contrib/fedora/rpm/NetworkManager.conf @@ -14,8 +14,9 @@ # If /etc/NetworkManager/conf.d/ contains a file with the same name as # /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored. # Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can -# put an empty file to etc with the same name. The same applies with respect -# to the directory /var/lib/NetworkManager/conf.d. +# put an empty file to /etc with the same name. The same applies with respect +# to the directory /var/run/NetworkManager/conf.d where files in /var/run shadow +# /usr/lib and are themselves shadowed by files under /etc. # # If two files define the same key, the one that is read afterwards will overwrite # the previous one.