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 c3ae88cab9ac01c39f0b91b743a59eed19008692 (commit) via d74d6844fd1adf21bdaa4cd800754975b06ef180 (commit) from f2d2c69787acc8ad3383d7482a15f0f8857f57ff (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 c3ae88cab9ac01c39f0b91b743a59eed19008692 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jan 31 10:06:34 2020 +0000
PPP: Always fetch DNS servers from provider
We will later decide whether we want to use them or not
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d74d6844fd1adf21bdaa4cd800754975b06ef180 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jan 31 10:04:14 2020 +0000
pppsetup.cgi: Drop DNS setting
This has already been dropped and should not be added again to the configuration file.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: html/cgi-bin/pppsetup.cgi | 7 ------- src/initscripts/networking/red | 12 +----------- 2 files changed, 1 insertion(+), 18 deletions(-)
Difference in files: diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index bdcd41e24..4b9b7271b 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -169,8 +169,6 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) if (! &General::validip($pppsettings{'BROADCAST'})) { $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } } - if( $pppsettings{'DNS'} eq 'Automatic') { - $errormessage = $Lang::tr{'invalid input'}; } if ($errormessage ne '') {goto ERROR; } }
@@ -442,10 +440,6 @@ $selected{'AUTH'}{'demon-login-script'} = ''; $selected{'AUTH'}{'other-login-script'} = ''; $selected{'AUTH'}{$pppsettings{'AUTH'}} = "selected='selected'";
-$checked{'DNS'}{'Automatic'} = ''; -$checked{'DNS'}{'Manual'} = ''; -$checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; - $checked{'IPTV'}{'enable'} = ''; $checked{'IPTV'}{'disable'} = ''; $checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'"; @@ -1014,7 +1008,6 @@ sub initprofile $pppsettings{'TIMEOUT'} = 15; $pppsettings{'MODULATION'} = 'AUTO'; $pppsettings{'AUTH'} = 'pap-or-chap'; - $pppsettings{'DNS'} = 'Automatic'; $pppsettings{'DEBUG'} = 'off'; $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; $pppsettings{'IPTVSERVERS'} = '192.168.2.51/32'; diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index b619836ae..e154cc8b1 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -376,16 +376,6 @@ case "${1}" in AUTH="" fi
- ### DNS Config - # - if [ "${DNS}" == "Automatic" ]; then - DNS="usepeerdns" - else - DNS="" - echo nameserver=$DNS1 > /etc/ppp/resolv.conf - echo nameserver=$DNS2 >> /etc/ppp/resolv.conf - fi - ### Dial On Demand # if [ "${RECONNECTION}" != "persistent" ]; then @@ -417,7 +407,7 @@ case "${1}" in ### Standard PPP options we always use # - PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth" + PPP_STD_OPTIONS="$PLUGOPTS usepeerdns defaultroute noipdefault noauth" PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach" PPP_STD_OPTIONS+=" noaccomp nodeflate nopcomp novj novjccomp" PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"
hooks/post-receive -- IPFire 2.x development tree