diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/network-manager.README.Debian | 22 |
2 files changed, 6 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog index 51c60892..ee5edaec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ network-manager (1.4.0-2) UNRELEASED; urgency=medium * Correctly set the connectivity state if we enforce online mode with unmanaged devices. + * Stop mentioning "managed=true" mode in README.Debian. Its usage is + strongly discouraged nowadays. -- Michael Biebl <biebl@debian.org> Fri, 26 Aug 2016 20:32:37 +0200 diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian index be826715..cade0bd2 100644 --- a/debian/network-manager.README.Debian +++ b/debian/network-manager.README.Debian @@ -42,25 +42,11 @@ unmanaged devices and /etc/network/interfaces ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Network devices which are configured in /etc/network/interfaces will typically -be managed by ifupdown. Such devices will by default be marked as "unmanaged" -in NetworkManager. - -You can tell NetworkManager to read and use the network configuration from -/etc/network/interfaces by editing /etc/NetworkManager/NetworkManager.conf -and changing the configuration as follows: - - [ifupdown] - managed=true - -After modifying /etc/NetworkManager/NetworkManager.conf or -/etc/network/interfaces you need to restart the NetworkManager service via -"service network-manager restart". - -It needs to be considered though that the network interface will also still be -managed by ifupdown. This can lead to unexpected behaviour if two network -configuration systems manage the same device. +be managed by ifupdown. NetworkManager respects such a configuration and will +ignore those devices and mark them as "unmanaged". If you want to have a network interface managed by NetworkManager it is thus recommended to manually remove any configuration for that interface from -/etc/network/interfaces. +/etc/network/interfaces. You need to restart NetworkManager afterwards via +"service network-manager restart". |