* debian/network-manager.README.Debian

  - Merge the README.Debian from Ubuntu which describes the new
    managed/unmanaged modes.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/networkmanager@2663 ceb527fc-18e6-0310-9fe2-813c157c29e7

2 files changed, 41 insertions, 57 deletions

diff --git a/debian/changelog b/debian/changelog
index 9759f5b4..409e7cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ network-manager (0.7.0-1) UNRELEASED; urgency=low
       versions of those packages do not work with network-manager 0.7.
   * debian/patches/05-dhclient_lease_files.patch
     - Change the location of the dhclient lease files to /var/lib/dhcp3.
+  * debian/network-manager.README.Debian
+    - Merge the README.Debian from Ubuntu which describes the new
+      managed/unmanaged modes.
 
  -- Michael Biebl <biebl@debian.org>  Sat, 06 Dec 2008 00:43:22 +0100
 
diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian
index c59c7f9b..aabe01f3 100644
--- a/debian/network-manager.README.Debian
+++ b/debian/network-manager.README.Debian
@@ -10,67 +10,48 @@ group "netdev". If you want to add a user to group "netdev" use the command
 "adduser username netdev" or one of the graphical user management frontends.
 After that you have to reload D-Bus with the command "/etc/init.d/dbus reload".
 
-Configuration of wireless and ethernet interfaces
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-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.
-
-After modifying /etc/network/interfaces you have to restart NM with the
-command "/etc/init.d/network-manager restart".
-
-Examples:
-
-1.)
-auto wlan0
-iface wlan0 inet dhcp
--> This device is managed by NM.
-
-1.a)
-allow-hotplug eth0
-iface eth0 inet dhcp
--> This device is managed by NM
-
-2.)
-auto wlan0
-iface wlan0 inet dhcp
-	wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf
--> This devices is *not* managed by NM because it has additional options.
-
-3.)
-iface wlan0 inet dhcp
--> This device is *not* managed by NM because it is not set to "auto".
-
-4.)
-iface eth0 inet static
-	address 192.168.1.10
-	netmask 255.255.255.0
-	gateway 192.168.1.1
--> This device is *not* managed by NM because it is configured as "static" and
-   has additional options.
-
-5.)
-Device is not listed in /etc/network/interfaces.
--> Device is managed by NM.
+Alternatively you can install the "consolekit" package which will grant access
+for all locally logged in users.
+
+
+Managed vs. Unmanaged mode and /etc/network/interfaces
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Devices listed in /etc/network/interfaces _will_ be managed by NetworkManager
+unless the ifupdown system-config-setting is enabled and is setup to run
+in "Unmanaged mode".
+
+The config to select unmanaged/managed mode is in
+/etc/NetworkManager/nm-system-settings.conf:
+
+  [ifupdown]
+  managed=true/false
+
+Unmanaged mode will make NetworkManager not touch any wired/wireless device
+matching an interface name configured in /etc/network/interfaces.
+
+Managed mode will make NetworkManager manage all devices and will make
+NetworkManager honour all dhcp and static configurations for wired and
+wireless devices.
+
+
+After modifying /etc/NetworkManager/nm-systems-settings.conf _or_
+/etc/network/interfaces you may want to restart the system-settings daemon
+using the command:
+"sudo killall nm-system-settings" to apply those changes.
+
 
 Dial-up configuration
 ~~~~~~~~~~~~~~~~~~~~~
-After configuring your PPP interface (either manually or by using a tool like
-"pppconfig") to work with a peer called "myisp" you should edit 
-/etc/network/interfaces and add a stanza like this:
-
-iface ppp0 inet ppp
-	provider myisp
 
-NM will then make it possible to dial this connection.
-If you want to set up multiple internet service providers simply create a new 
-stanza as listed above specifying the provider and a different iface, e.g. ppp1.
+Your dialup configurations can now be one in network-manager connection editor.
+Because of that /etc/network/interfaces configurations are considered "legacy"
+from a network manager point of view.
 
-After modifying /etc/network/interfaces you have to restart NM with the
-command "/etc/init.d/network-manager restart".
+However, if you want to use your /etc/network/interfaces configuration make
+sure that you have the ifupdown plugin in "Unmanaged mode" and take care that
+the used wired/wireless device is also configured in /etc/network/interfaces.
 
-Please read the "Debian Reference Manual", section 10.6.1.4 or the "interfaces"
-man page for further information.
+Not that NetworkManager 0.7 will not provive UI hooks to up and down ppp
+connections managed outside of NetworkManager itself (not that it ever worked
+nicely before).