about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-07-10 06:20:41 +0200
committerMichael Biebl <biebl@debian.org>2014-07-10 06:24:20 +0200
commitf8a371880547f1d6539eb5144589df4283ccaf28 (patch)
tree659d3962904c2fd987b6d7d32f0aa30086a24e38
parentf37a64257fac6dcd843c3edd63ebf1761c6157d3 (diff)
Create /etc/NetworkManager/conf.d/ directory
which can be used to extend the NetworkManager configuration without
having to modify the distro-provided NetworkManager.conf.
-rw-r--r--debian/changelog3
-rw-r--r--debian/network-manager.dirs1
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 48b3b4cf..aa995d86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ network-manager (0.9.10.0-1) UNRELEASED; urgency=medium
     - Add patch to treat virtual ethernet devices as unmanaged to avoid
       interfering with VBox and VMware network interfaces.
     - Refresh remaining patches.
+  * Create /etc/NetworkManager/conf.d/ directory which can be used to extend
+    the NetworkManager configuration without having to modify the
+    distro-provided NetworkManager.conf.
 
  -- Michael Biebl <biebl@debian.org>  Sun, 06 Jul 2014 03:04:21 +0200
 
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 0cefd6e9..934e6231 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,3 +1,4 @@
 var/lib/NetworkManager/
+etc/NetworkManager/conf.d/
 etc/NetworkManager/system-connections/
 etc/NetworkManager/VPN/