From: Michael Tremer Date: Wed, 12 Aug 2015 12:59:00 +0000 (+0100) Subject: Start Core Update 94 X-Git-Tag: v2.17-core94~73^2~1 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1;hp=9b1643fc3fd64a6ea0d5d02f20ceaa48b8fc8e41 Start Core Update 94 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/93/exclude b/config/rootfiles/core/94/exclude similarity index 100% rename from config/rootfiles/core/93/exclude rename to config/rootfiles/core/94/exclude diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files new file mode 100644 index 0000000000..168c7d188b --- /dev/null +++ b/config/rootfiles/core/94/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/93/meta b/config/rootfiles/core/94/meta similarity index 100% rename from config/rootfiles/core/93/meta rename to config/rootfiles/core/94/meta diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh new file mode 100644 index 0000000000..e679ecfffd --- /dev/null +++ b/config/rootfiles/core/94/update.sh @@ -0,0 +1,57 @@ +#!/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) 2015 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=94 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/93/exclude b/config/rootfiles/oldcore/93/exclude new file mode 100644 index 0000000000..18e9b4d243 --- /dev/null +++ b/config/rootfiles/oldcore/93/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/93/filelists/bind b/config/rootfiles/oldcore/93/filelists/bind similarity index 100% rename from config/rootfiles/core/93/filelists/bind rename to config/rootfiles/oldcore/93/filelists/bind diff --git a/config/rootfiles/core/93/filelists/daq b/config/rootfiles/oldcore/93/filelists/daq similarity index 100% rename from config/rootfiles/core/93/filelists/daq rename to config/rootfiles/oldcore/93/filelists/daq diff --git a/config/rootfiles/core/93/filelists/ddns b/config/rootfiles/oldcore/93/filelists/ddns similarity index 100% rename from config/rootfiles/core/93/filelists/ddns rename to config/rootfiles/oldcore/93/filelists/ddns diff --git a/config/rootfiles/core/93/filelists/dnsmasq b/config/rootfiles/oldcore/93/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/93/filelists/dnsmasq rename to config/rootfiles/oldcore/93/filelists/dnsmasq diff --git a/config/rootfiles/core/93/filelists/files b/config/rootfiles/oldcore/93/filelists/files similarity index 100% rename from config/rootfiles/core/93/filelists/files rename to config/rootfiles/oldcore/93/filelists/files diff --git a/config/rootfiles/core/93/filelists/libpcap b/config/rootfiles/oldcore/93/filelists/libpcap similarity index 100% rename from config/rootfiles/core/93/filelists/libpcap rename to config/rootfiles/oldcore/93/filelists/libpcap diff --git a/config/rootfiles/core/93/filelists/pcre b/config/rootfiles/oldcore/93/filelists/pcre similarity index 100% rename from config/rootfiles/core/93/filelists/pcre rename to config/rootfiles/oldcore/93/filelists/pcre diff --git a/config/rootfiles/core/93/filelists/squid b/config/rootfiles/oldcore/93/filelists/squid similarity index 100% rename from config/rootfiles/core/93/filelists/squid rename to config/rootfiles/oldcore/93/filelists/squid diff --git a/config/rootfiles/oldcore/93/meta b/config/rootfiles/oldcore/93/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/93/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/93/update.sh b/config/rootfiles/oldcore/93/update.sh similarity index 100% rename from config/rootfiles/core/93/update.sh rename to config/rootfiles/oldcore/93/update.sh diff --git a/make.sh b/make.sh index 4f6eedb0f4..1925929058 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="93" # Core Level (Filename) +CORE="94" # Core Level (Filename) PAKFIRE_CORE="93" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan