Merge branch 'master' into next

config/cfgroot/lang.pl

@@ -169,6 +169,9 @@ sub FindWebLanguage() {
 	my ($language, $country) = split(/_/, $shortlang);
 	push(@options, $language);
 
+	# Add English as fallback
+	push(@options, "en");
+
 	foreach my $option (@options) {
 		return $option if (-e "${General::swroot}/langs/$option.pl");
 	}

config/rootfiles/common/armv5tel/initscripts

@@ -34,6 +34,7 @@ etc/rc.d/init.d/firstsetup
 etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
+#etc/rc.d/init.d/haproxy
 #etc/rc.d/init.d/hostapd
 #etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec

config/rootfiles/common/i586/initscripts

@@ -36,6 +36,7 @@ etc/rc.d/init.d/firstsetup
 etc/rc.d/init.d/functions
 #etc/rc.d/init.d/gnump3d
 etc/rc.d/init.d/halt
+#etc/rc.d/init.d/haproxy
 #etc/rc.d/init.d/hostapd
 #etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec

config/rootfiles/core/88/filelists/files

@@ -1,6 +0,0 @@
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-var/ipfire/backup/bin/backup.pl
-var/ipfire/langs

config/rootfiles/core/89/filelists/collectd

@@ -0,0 +1 @@
+../../../common/collectd

config/rootfiles/core/89/filelists/files

@@ -0,0 +1,18 @@
+etc/system-release
+etc/issue
+etc/collectd.conf
+etc/collectd.vpn
+etc/rc.d/init.d/dnsmasq
+srv/web/ipfire/cgi-bin/ddns.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/netovpnrw.cgi
+srv/web/ipfire/cgi-bin/netovpnsrv.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/bin/backup.pl
+var/ipfire/graphs.pl
+var/ipfire/langs
+var/ipfire/lang.pl
+var/ipfire/menu.d/20-status.menu

config/rootfiles/core/89/filelists/fuse

@@ -0,0 +1 @@
+../../../common/fuse

config/rootfiles/core/89/filelists/ntfs-3g

@@ -0,0 +1 @@
+../../../common/ntfs-3g

config/rootfiles/core/89/filelists/openssh

@@ -0,0 +1 @@
+../../../common/openssh

config/rootfiles/core/89/filelists/openssl

@@ -0,0 +1 @@
+../../../common/openssl

config/rootfiles/core/89/filelists/openssl-compat

@@ -0,0 +1 @@
+../../../common/openssl-compat

config/rootfiles/core/89/filelists/setup

@@ -0,0 +1 @@
+../../../common/setup

config/rootfiles/core/89/filelists/strongswan

@@ -0,0 +1 @@
+../../../common/strongswan

config/rootfiles/core/89/filelists/tzdata

@@ -0,0 +1 @@
+../../../common/tzdata

config/rootfiles/core/89/update.sh

@@ -25,27 +25,35 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
 # Remove old core updates from pakfire cache to save space...
-core=88
+core=89
 for (( i=1; i<=$core; i++ ))
 do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
 # Stop services
+/etc/init.d/ipsec stop
 
 # Remove old files
 
 # Extract files
 extract_files
 
+# Generate ddns configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
+
 # Start services
+/etc/init.d/dnsmasq restart
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
 
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
-# Uninstall the sqlite package.
+# Prevent uninstall sqlite (now common package).
 rm -f \
-	/opt/pakfire/db/installed/meta-sqlite \
+	/opt/pakfire/db/*/meta-sqlite \
 	/opt/pakfire/db/rootfiles/sqlite
 
 # Fix #10625