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