[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89baf6d537a92d2a4f640dba97ef387ee5511daf

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 89baf6d537a92d2a4f640dba97ef387ee5511daf

[git]

[-- Attachment #1: Type: text/plain, Size: 3736 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  89baf6d537a92d2a4f640dba97ef387ee5511daf (commit)
      from  d43bb759b1bb6d02a93b63d0dfd82e623685fb21 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 89baf6d537a92d2a4f640dba97ef387ee5511daf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jul 9 12:15:07 2013 +0200

    ppp: Don't require setting the MTU configuration.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/71/filelists/files |  1 +
 html/cgi-bin/pppsetup.cgi                |  8 ++++----
 src/initscripts/init.d/networking/red    | 10 +++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files
index fe6b73d..4201c38 100644
--- a/config/rootfiles/core/71/filelists/files
+++ b/config/rootfiles/core/71/filelists/files
@@ -12,6 +12,7 @@ etc/rc.d/rc0.d/K82wlanclient
 etc/rc.d/rc3.d/S19wlanclient
 etc/rc.d/rc6.d/K82wlanclient
 usr/local/bin/wirelessclient
+srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/wirelessclient.cgi
 var/ipfire/langs
 var/ipfire/backup/include
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index f6b29e1..ca6892b 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -818,11 +818,11 @@ print <<END
 </tr>
 <tr>
 <tr>
-        <td width='25%'>MTU</td>
+        <td width='25%'>MTU&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
 </tr>
 <tr>
-        <td width='25%'>MRU</td>
+        <td width='25%'>MRU&nbsp;<img src='/blob.gif' alt='*' /></td>
         <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td>
 </tr>
 END
@@ -943,8 +943,8 @@ sub initprofile
 	$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
 	$pppsettings{'PPTP_ROUTE'} = '';
         $pppsettings{'PROTOCOL'} = 'RFC2364';
-        $pppsettings{'MTU'} = '1492';
-        $pppsettings{'MRU'} = '1492';
+        $pppsettings{'MTU'} = '';
+        $pppsettings{'MRU'} = '';
         $pppsettings{'DIALMODE'} = 'T';
         $pppsettings{'MAXRETRIES'} = 5;
         $pppsettings{'HOLDOFF'} = 30;
diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index e28b2e6..b33c03f 100644
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -388,10 +388,18 @@ case "${1}" in
 			### Standard PPP options we always use
 			#
 			PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth"
-			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach mtu ${MTU}"
+			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
 			PPP_STD_OPTIONS+=" mru ${MRU} noaccomp nodeflate nopcomp novj novjccomp"
 			PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
 			PPP_STD_OPTIONS+=" lcp-echo-failure 5 ${AUTH}"
+
+			if [ -n "${MTU}" ]; then
+				PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mtu ${MTU}"
+			fi
+
+			if [ -n "${MRU}" ]; then
+				PPP_STD_OPTIONS="${PPP_STD_OPTIONS} mru ${MRU}"
+			fi
 				
 			### Debugging
 			#


hooks/post-receive
--
IPFire 2.x development tree