diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2011-02-03 19:54:25 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2011-02-03 19:54:25 +0000 |
| commit | 7096fbc06b683bcd05f50e01e3f3af7b4418fed4 (patch) | |
| tree | 73a469839c0217679ee219cbf16b087e89d1172b /lib/network/network.pm | |
| parent | 901b8f51b22aec08bc91921276d721387809207f (diff) | |
| download | drakx-net-7096fbc06b683bcd05f50e01e3f3af7b4418fed4.tar drakx-net-7096fbc06b683bcd05f50e01e3f3af7b4418fed4.tar.gz drakx-net-7096fbc06b683bcd05f50e01e3f3af7b4418fed4.tar.bz2 drakx-net-7096fbc06b683bcd05f50e01e3f3af7b4418fed4.tar.xz drakx-net-7096fbc06b683bcd05f50e01e3f3af7b4418fed4.zip | |
Allow interface to be controlled by NetworkManager
Merge mdv commit 271832
Diffstat (limited to 'lib/network/network.pm')
| -rw-r--r-- | lib/network/network.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/network/network.pm b/lib/network/network.pm index 77e7e4c..2ff65be 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -192,6 +192,7 @@ sub write_interface_settings { qw(DISCONNECTTIMEOUT PERSIST DEFROUTE), qw(VPN_NAME VPN_TYPE), qw(ACCOUNTING), + qw(NM_CONTROLLED), qw(CELLULAR_CID), if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_CLIENT DHCP_HOSTNAME NEEDHOSTNAME PEERDNS PEERYP PEERNTPD DHCP_TIMEOUT)), if_($intf->{DEVICE} =~ /^ippp\d+$/, qw(DIAL_ON_IFUP)) |