about summary refs log tree commit diff
path: root/debian/README.Debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@teco.edu>2006-05-10 00:36:14 +0000
committerMichael Biebl <biebl@teco.edu>2006-05-10 00:36:14 +0000
commita5a5d5671a0c793b4d45373947178fa77fec9a16 (patch)
treeeb7a5f844a1aabd50512208dda833bc776086b0d /debian/README.Debian
parent63b3f3f48fb827a50b82d46c358dbedea4060770 (diff)
Fix the /etc/network/interfaces parser:
- Only add data to an existing block (prevents segfault)
- Support mapping and allow-* stanzas.


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@820 ceb527fc-18e6-0310-9fe2-813c157c29e7
Diffstat (limited to 'debian/README.Debian')
-rw-r--r--debian/README.Debian7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 537f1c83..4694c299 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -11,8 +11,11 @@ After that you have to reload dbus with the command "/etc/init.d/dbus reload".
 
 Configuration
 ~~~~~~~~~~~~~
-Only devices that are not listed in /etc/network/interfaces or which have been
-configured "auto" and "dhcp" (with no other options) are managed by NM.
+Only devices that are *not* listed in /etc/network/interfaces or which have 
+been configured "auto" and "dhcp" (with no other options) are managed by NM.
+
+This way you can setup a custom (static) configuration for a device and NM 
+will not try to override this setting.
 
 Examples: