Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

This commit is contained in:
Michael Tremer
2010-12-11 10:55:03 +01:00
4 changed files with 6 additions and 8 deletions

View File

@@ -24,8 +24,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.8test" # Version number
CORE="44" # Core Level (Filename)
VERSION="2.9beta1" # Version number
CORE="43" # Core Level (Filename)
PAKFIRE_CORE="43" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan

View File

@@ -188,10 +188,10 @@ case "$1" in
/sbin/iptables -A FORWARD -j OUTGOINGFW
# localhost and ethernet.
/sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT
/sbin/iptables -I INPUT 1 -i lo -s 127.0.0.0/8 -d 127.0.0.0/8 -m state --state NEW -j ACCEPT
/sbin/iptables -A INPUT -s 127.0.0.0/8 -m state --state NEW -j DROP # Loopback not on lo
/sbin/iptables -A INPUT -d 127.0.0.0/8 -m state --state NEW -j DROP
/sbin/iptables -A FORWARD -i lo -m state --state NEW -j ACCEPT
/sbin/iptables -A FORWARD -i lo -s 127.0.0.0/8 -d 127.0.0.0/8 -m state --state NEW -j ACCEPT
/sbin/iptables -A FORWARD -s 127.0.0.0/8 -m state --state NEW -j DROP
/sbin/iptables -A FORWARD -d 127.0.0.0/8 -m state --state NEW -j DROP
/sbin/iptables -A INPUT -i $GREEN_DEV -m state --state NEW -j ACCEPT ! -p icmp

View File

@@ -19,9 +19,7 @@
# #
###############################################################################
# Path for testing. Need to be changed for release!
IPFireISO=people.ipfire.org/~arne_f/testing/next/ipfire.iso
#IPFireISO=download.ipfire.org/iso/ipfire.iso
IPFireISO=download.ipfire.org/iso/ipfire.iso
#Get user defined download from boot cmdline
grep "netinstall=" /proc/cmdline > /dev/null && CMDLINE=1

View File

@@ -3,7 +3,7 @@
COREVER=`cat /opt/pakfire/db/core/mine`
# FIXME: edit this lines before release
URL=http://download.ipfire.org/iso/
ISO=ipfire-2.7.i586-full-core$COREVER.iso
ISO=ipfire-2.9beta1.i586-full-core$COREVER.iso
if [ -z "$1" ]; then
echo usage: $0 backup-file