ppp: Don't require setting the MTU configuration.

diff --git a/config/rootfiles/core/71/filelists/files b/config/rootfiles/core/71/filelists/files
index fe6b73da0bdfbc0c764c412278e5c435ad7c5404..4201c38012584429a0690f3b4e5342870b044510 100644 (file)
--- 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 f6b29e199bd5ac8b0c840dba6c8dda178e62ecb4..ca6892bf151b0ce18482da67b014207641d115bc 100644 (file)
--- 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 e28b2e67be931cf92da7a8798c69e729afd82d8d..b33c03f136f67168490f6001c42f82256338dca0 100644 (file)
--- 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
                        #