Add static-routing feature to core update.

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 5ac578a909421df5e469147e342002b3ea733983..8fdd7ac96a4c5dbb86aaa3c390f5ec1429c7f7d6 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -67,6 +67,7 @@ var/ipfire/mac
 var/ipfire/main
 #var/ipfire/main/disable_nf_sip
 #var/ipfire/main/hosts
+#var/ipfire/main/routing
 #var/ipfire/main/settings
 #var/ipfire/menu.d
 var/ipfire/menu.d/00-menu.main

diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files
index 30727a506e5b0a40ee23e9cad637fdc9e3a56f12..7b85a54462e5de3b93d165e28c34ccdf996fba55 100644 (file)
--- a/config/rootfiles/core/next/filelists/files
+++ b/config/rootfiles/core/next/filelists/files
@@ -1,8 +1,11 @@
+etc/rc.d/init.d/network
+etc/rc.d/init.d/static-routing
 etc/sysctl.conf
 etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
@@ -11,3 +14,5 @@ var/ipfire/langs/fr.pl
 var/ipfire/langs/pl.pl
 usr/local/bin/ipsecctrl
 usr/local/bin/vpn-watch
+usr/local/bin/rebuildroutes
+var/ipfire/main/routing

diff --git a/lfs/configroot b/lfs/configroot
index 43c2d21558d9fe4140273e123fbf25eebd0647ff..f35361469d4d99212339ebacc7b067d90bcc3817 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -65,7 +65,7 @@ $(TARGET) :
            certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
            dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
            extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
-           isdn/settings mac/settings main/disable_nf_sip main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
+           isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
            pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
            ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 7f27a65a8cb6c589678cfb7545de230b1eff9335..c773b83c2cac7204bed04646136aa99f64ebe924 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -51,6 +51,7 @@ init_networking() {
        fi
 
        /etc/rc.d/init.d/dnsmasq start
+       /etc/rc.d/init.d/static-routing start
 }
 
 DO="${1}"