From b7b5110d1620e2c636e7b4f588c57d82dc0910a2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 23 Oct 2008 18:04:47 +0000 Subject: [PATCH] 2008-10-23 Dan Williams * 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 --- ChangeLog | 7 +++++++ src/ppp-manager/nm-ppp-manager.c | 15 +++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3efc9269..e22628def 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-23 Dan Williams + + * 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 * src/NetworkManagerSystem.c diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index abf9a0bf6..fb8f7b238 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -725,6 +725,9 @@ create_pppd_cmd_line (NMPPPManager *self, nm_cmd_line_add_string (cmd, "nodetach"); 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"); if (ppp_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); } - if (setting->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_string (cmd, "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_int (cmd, setting->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_string (cmd, "ipparam"); nm_cmd_line_add_string (cmd, priv->dbus_path);