From: Michael Tremer Date: Mon, 6 Nov 2017 18:10:02 +0000 (+0000) Subject: Start Core Update 117 X-Git-Tag: v2.19-core117~1^2~93 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=bb3272dad36da7cbefbbd4a9b0b3d98b760fbd49 Start Core Update 117 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/116/exclude b/config/rootfiles/core/117/exclude similarity index 100% rename from config/rootfiles/core/116/exclude rename to config/rootfiles/core/117/exclude diff --git a/config/rootfiles/core/117/filelists/files b/config/rootfiles/core/117/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/117/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/116/meta b/config/rootfiles/core/117/meta similarity index 100% rename from config/rootfiles/core/116/meta rename to config/rootfiles/core/117/meta diff --git a/config/rootfiles/core/117/update.sh b/config/rootfiles/core/117/update.sh new file mode 100644 index 0000000000..a8d83baafc --- /dev/null +++ b/config/rootfiles/core/117/update.sh @@ -0,0 +1,62 @@ +#!/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) 2017 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=117 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# 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/116/exclude b/config/rootfiles/oldcore/116/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/116/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +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/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/116/filelists/apache2 b/config/rootfiles/oldcore/116/filelists/apache2 similarity index 100% rename from config/rootfiles/core/116/filelists/apache2 rename to config/rootfiles/oldcore/116/filelists/apache2 diff --git a/config/rootfiles/core/116/filelists/files b/config/rootfiles/oldcore/116/filelists/files similarity index 100% rename from config/rootfiles/core/116/filelists/files rename to config/rootfiles/oldcore/116/filelists/files diff --git a/config/rootfiles/core/116/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/116/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/116/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/116/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/116/filelists/openssh b/config/rootfiles/oldcore/116/filelists/openssh similarity index 100% rename from config/rootfiles/core/116/filelists/openssh rename to config/rootfiles/oldcore/116/filelists/openssh diff --git a/config/rootfiles/core/116/filelists/openssl b/config/rootfiles/oldcore/116/filelists/openssl similarity index 100% rename from config/rootfiles/core/116/filelists/openssl rename to config/rootfiles/oldcore/116/filelists/openssl diff --git a/config/rootfiles/core/116/filelists/snort b/config/rootfiles/oldcore/116/filelists/snort similarity index 100% rename from config/rootfiles/core/116/filelists/snort rename to config/rootfiles/oldcore/116/filelists/snort diff --git a/config/rootfiles/core/116/filelists/wget b/config/rootfiles/oldcore/116/filelists/wget similarity index 100% rename from config/rootfiles/core/116/filelists/wget rename to config/rootfiles/oldcore/116/filelists/wget diff --git a/config/rootfiles/core/116/filelists/xz b/config/rootfiles/oldcore/116/filelists/xz similarity index 100% rename from config/rootfiles/core/116/filelists/xz rename to config/rootfiles/oldcore/116/filelists/xz diff --git a/config/rootfiles/oldcore/116/meta b/config/rootfiles/oldcore/116/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/116/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/oldcore/116/update.sh similarity index 100% rename from config/rootfiles/core/116/update.sh rename to config/rootfiles/oldcore/116/update.sh diff --git a/make.sh b/make.sh index f4d474d364..f8a2e5b34a 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="116" # Core Level (Filename) +CORE="117" # Core Level (Filename) PAKFIRE_CORE="116" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan