Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/29/filelists/files

config/backup/include

@@ -3,7 +3,7 @@
 /var/ipfire/*/*.pem
 /var/ipfire/*/config
 /var/ipfire/*/enable
-/var/ipifre/*/*enable*
+/var/ipfire/*/*enable*
 /etc/passwd
 /etc/shadow
 /etc/group
@@ -30,3 +30,4 @@
 /etc/sysconfig/rc.local
 /root/.gitconfig
 /root/.bash_history
+/var/ipfire/ethernet/aliases

config/rootfiles/common/linux-firmware

@@ -59,6 +59,7 @@ lib/firmware/ti_5052.fw
 lib/firmware/tr_smctr.bin
 #lib/firmware/ttusb-budget
 lib/firmware/ttusb-budget/dspbootcode.bin
+lib/firmware/av7110/bootcode.bin
 #lib/firmware/vicam
 lib/firmware/vicam/firmware.fw
 lib/firmware/whiteheat.fw

config/rootfiles/core/29/filelists/files

@@ -7,3 +7,6 @@ srv/web/ipfire/html/blob.gif
 srv/web/ipfire/html/images/info.gif
 srv/web/ipfire/html/images/openvpn.png
 var/ipfire/menu.d/50-firewall.menu
+lib/firmware/av7110/bootcode.bin
+var/ipfire/backup/include
+etc/rc.d/init.d/networking/red

lfs/nagiosql

@@ -35,7 +35,7 @@ TARGET     = $(DIR_INFO)/nagiosql-$(VER)
 PROG       = nagiosql
 PAK_VER    = 1
 
-DEPS       = "nagios"
+DEPS       = "nagios mysql"
 
 ###############################################################################
 # Top-level Rules
@@ -85,7 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -vf $(DIR_SRC)/config/nagiosql/nagios.conf /etc/httpd/conf/vhosts.d/
 	cp -vrf $(DIR_SRC)/config/nagiosql/pear/HTML /usr/lib/php
 	cp -vrf $(DIR_SRC)/config/nagiosql/etc /
-	chown -R nobody /etc/nagiosql
+	chown -R nobody:nobody /etc/nagiosql
 	chown nobody /usr/share/nagiosql/config
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

src/initscripts/init.d/networking/red

@@ -122,7 +122,10 @@ case "${1}" in
 			evaluate_retval
 			
 			run_subdir ${rc_base}/init.d/networking/red.up/
-			
+
+			# Configure aliases only if red static
+			/usr/local/bin/setaliases
+
 		elif [ "${TYPE}" == "DHCP" ]; then
 
 			if [ -e $LEASEINFO ]; then