Add aliases to backup and run setaliases at red start (if red=static only)

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/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index 536160d243df541af539f874c8045991b60301bb..9b62cc76389298729d6495631792079f2860cfd0 100644 (file)
--- a/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@ -8,3 +8,5 @@ srv/web/ipfire/images/info.gif
 srv/web/ipfire/images/openvpn.gif
 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/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