colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-10-23 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/ppp-manager/nm-ppp-manager.c
		- (create_pppd_cmd_line): pppd always parses /etc/ppp/options, so always
			add really important stuff to the command line to ensure that NM
			overrides /etc/ppp/options (bgo #556781)



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4209 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-10-23 18:04:47 +00:00
parent 5fa0c6035e
commit b7b5110d16
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2008-10-23 Dan Williams <dcbw@redhat.com>
* src/ppp-manager/nm-ppp-manager.c
- (create_pppd_cmd_line): pppd always parses /etc/ppp/options, so always
add really important stuff to the command line to ensure that NM
overrides /etc/ppp/options (bgo #556781)
2008-10-22 Dan Williams <dcbw@redhat.com> 2008-10-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerSystem.c * src/NetworkManagerSystem.c

7
src/ppp-manager/nm-ppp-manager.c
View File

@@ -725,6 +725,9 @@ create_pppd_cmd_line (NMPPPManager *self,
nm_cmd_line_add_string (cmd, "nodetach"); nm_cmd_line_add_string (cmd, "nodetach");
nm_cmd_line_add_string (cmd, "lock"); nm_cmd_line_add_string (cmd, "lock");
/* NM handles setting the default route */
nm_cmd_line_add_string (cmd, "nodefaultroute");
ppp_debug = getenv ("NM_PPP_DEBUG"); ppp_debug = getenv ("NM_PPP_DEBUG");
if (ppp_debug) if (ppp_debug)
nm_cmd_line_add_string (cmd, "debug"); nm_cmd_line_add_string (cmd, "debug");
@@ -797,15 +800,11 @@ create_pppd_cmd_line (NMPPPManager *self,
nm_cmd_line_add_int (cmd, setting->mtu); nm_cmd_line_add_int (cmd, setting->mtu);
} }
if (setting->lcp_echo_failure) {
nm_cmd_line_add_string (cmd, "lcp-echo-failure"); nm_cmd_line_add_string (cmd, "lcp-echo-failure");
nm_cmd_line_add_int (cmd, setting->lcp_echo_failure); nm_cmd_line_add_int (cmd, setting->lcp_echo_failure);
}
if (setting->lcp_echo_interval) {
nm_cmd_line_add_string (cmd, "lcp-echo-interval"); nm_cmd_line_add_string (cmd, "lcp-echo-interval");
nm_cmd_line_add_int (cmd, setting->lcp_echo_interval); nm_cmd_line_add_int (cmd, setting->lcp_echo_interval);
}
nm_cmd_line_add_string (cmd, "ipparam"); nm_cmd_line_add_string (cmd, "ipparam");
nm_cmd_line_add_string (cmd, priv->dbus_path); nm_cmd_line_add_string (cmd, priv->dbus_path);