about summary refs log tree commit diff
path: root/debian/NetworkManager.conf
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2010-11-29 00:48:02 +0100
committerMichael Biebl <biebl@debian.org>2010-11-29 00:48:02 +0100
commite2123f8ef48519892659c90f64f588a7b24069ee (patch)
treef87005bd6dc2a3edc6db3dd7b0ebdb05fdb17265 /debian/NetworkManager.conf
parent9fae01fa351805b2903e535736e06971bc0b925e (diff)
parenta38c18be91a727db6daf6055a2ed7996f148c8aa (diff)
Merge remote branch 'svn/master'
Diffstat (limited to 'debian/NetworkManager.conf')
-rw-r--r--debian/NetworkManager.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/NetworkManager.conf b/debian/NetworkManager.conf
new file mode 100644
index 00000000..d8b33d91
--- /dev/null
+++ b/debian/NetworkManager.conf
@@ -0,0 +1,5 @@
+[main]
+plugins=ifupdown,keyfile
+
+[ifupdown]
+managed=false