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

diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index 9b3f2bff43525e2d6a93c151354f006460705df8..f3cd67fb099e2f03da1e3db5413f23a86d1521cc 100755 (executable)
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -238,8 +238,8 @@ sub get_interface
        if($net eq "$netsettings{'BLUE_NETADDRESS'}/$netsettings{'BLUE_NETMASK'}"){
                return "$netsettings{'BLUE_DEV'}";
        }
-       if($net eq "0.0.0.0/0"){
-               return "$netsettings{'RED_DEV'}";
+       if($net eq "0.0.0.0/0") {
+               return &get_external_interface();
        }
        return "";
 }

diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/core/84/filelists/files
index c26e2ea098eb66f6be27ad5a599b02c9cc453baa..2cbc242ebbca24dffa5705ada41d9ed9b8d09894 100644 (file)
--- a/config/rootfiles/core/84/filelists/files
+++ b/config/rootfiles/core/84/filelists/files
@@ -7,4 +7,5 @@ srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
 usr/lib/firewall/firewall-lib.pl
 usr/lib/firewall/rules.pl
+usr/local/bin/update-lang-cache
 var/ipfire/langs