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

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

diff --git a/config/backup/include b/config/backup/include
index 0ce2dc6ca0486b065858cee2eb8938f55b9da8e9..87abb071e37e5ce5ffd31b3909364ffb95895c72 100644 (file)
--- a/config/backup/include
+++ b/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

diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index 8ae06f0e8aec0d5fbeceac2036380cd9e60ff4d2..386e6d964a49162ac4248a4233f8791c9389aae9 100644 (file)
--- a/config/rootfiles/common/linux-firmware
+++ b/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

diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index c969afedef1aa88012991ced5517e9fa6c80162a..bba4e40d9e1c10a32601db0bd6528b423d6de62a 100644 (file)
--- a/config/rootfiles/core/29/filelists/files
+++ b/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

diff --git a/lfs/nagiosql b/lfs/nagiosql
index 1157ee2e8f5731c20f53ce97322e45e4e4da1fd4..4f31821436a6022e37c1360b1969523acf08e1e0 100644 (file)
--- a/lfs/nagiosql
+++ b/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)

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 6a85eb48e65d3d6d1e0153816935501749126e70..f90e07378d5d3767d91f3a1a862fb5f282471681 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/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