summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-04-16 14:51:20 +0200
committerThomas Haller <thaller@redhat.com>2015-04-16 18:43:03 +0200
commit36fc5cac83c9f1ba35d83ecfb163ba50eea169e1 (patch)
tree2c8452ae83936ad333076bef42478d72aa9b75a4
parent2bb44d91d814b6d2054e3e1d17002f58d6f273b5 (diff)
downloadNetworkManager-36fc5cac83c9f1ba35d83ecfb163ba50eea169e1.tar.gz
contrib/rpm: add comment to NetworkManager.conf file
https://mail.gnome.org/archives/networkmanager-list/2015-April/msg00036.html
-rw-r--r--contrib/fedora/rpm/NetworkManager.conf13
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.conf b/contrib/fedora/rpm/NetworkManager.conf
index 88b7cec290..900ca9b23b 100644
--- a/contrib/fedora/rpm/NetworkManager.conf
+++ b/contrib/fedora/rpm/NetworkManager.conf
@@ -1,2 +1,15 @@
+# Configuration file for NetworkManager.
+#
+# See "man 5 NetworkManager.conf" for details.
+#
+# The directory /etc/NetworkManager/conf.d/ can contain additional configuration
+# snippets that are installed by some packages. Those snippets override the
+# settings from this main file.
+# To override a configuration from a conf.d/ snippet, add another configuration
+# with a name sorted lastly (such as 99-my.conf).
+
[main]
plugins=ifcfg-rh,ibft
+
+[logging]
+#level=DEBUG