diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-14 08:58:25 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-17 21:24:18 +0200 |
| commit | 80c0dab9c70e5ba4ef46093f986ae321790fbfb6 (patch) | |
| tree | 49e374da6f2eae96ed2df540f5c4f84f84d2e0b1 | |
| parent | ad142e1945062dc855d95bf6a2b51c218251d8c6 (diff) | |
| download | NetworkManager-80c0dab9c70e5ba4ef46093f986ae321790fbfb6.tar.gz | |
contrib/rpm: reword comment in NetworkManager.conf
This change is a bit annoying, because we package "NetworkManager.conf" file in
our RPM. So, upon package upgrade, rpm will note that a new config file should
be installed and thus will leave ".rpmnew" files.
Also, don't mention "/var/run". It should really be just "/run" because
"/var" might not be mounted in early boot/initrd or in rescue environment.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.conf b/contrib/fedora/rpm/NetworkManager.conf index 1979ea6878..a2bb0fd39e 100644 --- a/contrib/fedora/rpm/NetworkManager.conf +++ b/contrib/fedora/rpm/NetworkManager.conf @@ -2,7 +2,7 @@ # # See "man 5 NetworkManager.conf" for details. # -# The directories /usr/lib/NetworkManager/conf.d/ and /var/run/NetworkManager/conf.d/ +# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/ # can contain additional configuration snippets installed by packages. These files are # read before NetworkManager.conf and have thus lowest priority. # The directory /etc/NetworkManager/conf.d/ can contain additional configuration @@ -15,7 +15,7 @@ # /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/run/NetworkManager/conf.d where files in /var/run shadow +# to the directory /run/NetworkManager/conf.d where files in /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 @@ -44,7 +44,7 @@ # # Note that debug logging of NetworkManager can be quite verbose. Some messages # might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst -# in man journald.conf). +# in man journald.conf). Please disable rate-limiting before collecting debug logs. # #level=TRACE #domains=ALL |