Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid

This commit is contained in:
Michael Tremer
2014-10-11 07:18:03 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -238,8 +238,8 @@ sub get_interface
if($net eq "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"){ if($net eq "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"){
return "$netsettings{'BLUE_DEV'}"; return "$netsettings{'BLUE_DEV'}";
} }
if($net eq "0.0.0.0/0"){ if($net eq "0.0.0.0/0") {
return "$netsettings{'RED_DEV'}"; return &get_external_interface();
} }
return ""; return "";
} }

View File

@@ -7,4 +7,5 @@ srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/urlfilter.cgi
usr/lib/firewall/firewall-lib.pl usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/rules.pl usr/lib/firewall/rules.pl
usr/local/bin/update-lang-cache
var/ipfire/langs var/ipfire/langs