Merge branch 'master' into dracut

config/rootfiles/common/configroot

@@ -22,6 +22,7 @@ var/ipfire/ddns
 var/ipfire/dhcp
 #var/ipfire/dhcp/advoptions
 #var/ipfire/dhcp/advoptions-list
+#var/ipfire/dhcp/dhcpd.conf.local
 #var/ipfire/dhcp/fixleases
 #var/ipfire/dhcp/settings
 var/ipfire/dhcpc

config/rootfiles/core/39/filelists/files

@@ -9,8 +9,9 @@ usr/local/bin/urlfilterctrl
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/urlfilter.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
 /opt/pakfire/lib/functions.pl
 var/ipfire/langs/de.pl
 var/ipfire/langs/en.pl
 var/ipfire/langs/es.pl
-var/ipfire/langs/fr.pl
+var/ipfire/langs/fr.pl

config/rootfiles/core/39/filelists/strongswan

@@ -0,0 +1 @@
+../../../common/strongswan

config/rootfiles/core/40/filelists/files

@@ -0,0 +1 @@
+etc/system-release

config/rootfiles/core/40/meta

@@ -0,0 +1 @@
+DEPS=""

config/rootfiles/core/40/update.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+#Stop services
+
+#
+#Extract files
+extract_files
+#
+#Start services
+
+#
+#Update Language cache
+#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+#
+#Finish
+#Don't report the exitcode last command
+exit 0

html/cgi-bin/dhcp.cgi

@@ -1199,6 +1199,7 @@ sub buildconf {
 	    $key++;
 	}
     }
+    print FILE "include \"${General::swroot}/dhcp/dhcpd.conf.local\";\n";
     close FILE;
     if ( $dhcpsettings{"ENABLE_GREEN"} eq 'on' || $dhcpsettings{"ENABLE_BLUE"} eq 'on' ) {system '/usr/local/bin/dhcpctrl enable >/dev/null 2>&1';}
     else {system '/usr/local/bin/dhcpctrl disable >/dev/null 2>&1';}

langs/de/cgi-bin/de.pl

@@ -1705,7 +1705,7 @@
 'unknown' => 'Unbekannt',
 'unnamed' => 'Unbenannt',
 'update' => 'Aktualisieren',
-'update accelerator' => 'Update-Booster',
+'update accelerator' => 'Update-Accelerator',
 'update time' => 'Aktualisiere die Uhrzeit:',
 'update transcript' => 'Aktualisieren',
 'updatedatabase' => 'Datenbank auf Stand der letzten Reports setzen',

langs/en/cgi-bin/en.pl

@@ -1738,7 +1738,7 @@
 'unknown' => 'UNKNOWN',
 'unnamed' => 'Unnamed',
 'update' => 'Update',
-'update accelerator' => 'Update Booster',
+'update accelerator' => 'Update Accelerator',
 'update time' => 'Update the time:',
 'update transcript' => 'Update transcript',
 'updatedatabase' => 'Update Database with last report',

langs/fr/cgi-bin/fr.pl

@@ -1738,7 +1738,7 @@
 'unknown' => 'UNKNOWN',
 'unnamed' => 'Unnamed',
 'update' => 'Update',
-'update accelerator' => 'Update Booster',
+'update accelerator' => 'Update Accelerator',
 'update time' => 'Update the time:',
 'update transcript' => 'Update transcript',
 'updatedatabase' => 'Update Database with last report',

lfs/configroot

@@ -63,7 +63,7 @@ $(TARGET) :
 	# Touch empty files
 	for i in auth/users backup/include.user backup/exclude.user \
 	    certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
-	    dhcp/fixleases dhcp/advoptions dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+	    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 \
 	    pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \

make.sh

@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.7"							# Version number
-CORE="39"							# Core Level (Filename)
+CORE="40"							# Core Level (Filename)
-PAKFIRE_CORE="38"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="39"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir

src/initscripts/init.d/functions

@@ -438,7 +438,7 @@ loadproc()
 {
 	local pidfile=""
 	local forcestart=""
-	local nicelevel="10"
+	local nicelevel=""
 
 # This will ensure compatibility with previous LFS Bootscripts
 	if [ -n "${PIDFILE}" ];	then
@@ -500,7 +500,13 @@ loadproc()
 		esac
 	fi
 
-	nice -n "${nicelevel}" "${@}"
+	local cmd="${@}"
+
+	if [ -n "${nicelevel}" ]; then
+		cmd="nice -n "${nicelevel}" ${cmd}"
+	fi
+
+	${cmd}
 	evaluate_retval # This is "Probably" not LSB compliant, but required to be compatible with older bootscripts
 	return 0
 }