This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 3ea9703e69f3453b147b6b02e8258775d30ee6e9 (commit) via bb4cfcc1bf35790fdbb6c56019ba23a3367465ed (commit) via 5d2c8f5da1d3f0e31ce9c3c274c5e23a8c4d13cb (commit) from e57d2133a3581a78b80412852dfaf68ebcffadc7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 3ea9703e69f3453b147b6b02e8258775d30ee6e9 Merge: bb4cfcc e57d213 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 15:52:11 2011 +0200

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

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

commit bb4cfcc1bf35790fdbb6c56019ba23a3367465ed Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 15:50:43 2011 +0200

Add static-routing feature to core update.

commit 5d2c8f5da1d3f0e31ce9c3c274c5e23a8c4d13cb Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Sep 4 15:39:57 2011 +0200

static-routing: Add "proto static" to static kernel routes.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/configroot | 1 + config/rootfiles/core/next/filelists/files | 4 ++++ lfs/configroot | 2 +- src/initscripts/init.d/network | 1 + src/initscripts/init.d/static-routes | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 5ac578a..8fdd7ac 100644 --- 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 95cde2c..d2a8d6d 100644 --- a/config/rootfiles/core/next/filelists/files +++ b/config/rootfiles/core/next/filelists/files @@ -1,3 +1,5 @@ +etc/rc.d/init.d/network +etc/rc.d/init.d/static-routing etc/sysctl.conf etc/system-release etc/issue @@ -19,3 +21,5 @@ var/ipfire/langs/pl.pl usr/local/bin/ipsecctrl usr/local/bin/openvpnctrl usr/local/bin/vpn-watch +usr/local/bin/rebuildroutes +var/ipfire/main/routing diff --git a/lfs/configroot b/lfs/configroot index 43c2d21..f353614 100644 --- 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 7f27a65..c773b83 100644 --- 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}" diff --git a/src/initscripts/init.d/static-routes b/src/initscripts/init.d/static-routes index 970083c..940a7b4 100644 --- a/src/initscripts/init.d/static-routes +++ b/src/initscripts/init.d/static-routes @@ -35,7 +35,7 @@ function create_all_routes() { continue fi

- ip route add ${network} via ${gateway} table static + ip route add ${network} via ${gateway} table static proto static done < ${file} }

hooks/post-receive -- IPFire 2.x development tree