From: Michael Tremer Date: Thu, 16 Aug 2018 11:47:06 +0000 (+0100) Subject: Start Core Update 124 X-Git-Tag: v2.21-core124~79 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=264f34546f2196c7a2459fa8fadb1fd4dbb1f948 Start Core Update 124 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/123/exclude b/config/rootfiles/core/124/exclude similarity index 100% rename from config/rootfiles/core/123/exclude rename to config/rootfiles/core/124/exclude diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files new file mode 100644 index 0000000000..a8b0ab45f6 --- /dev/null +++ b/config/rootfiles/core/124/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs \ No newline at end of file diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh new file mode 100644 index 0000000000..068fc4c61b --- /dev/null +++ b/config/rootfiles/core/124/update.sh @@ -0,0 +1,66 @@ +#!/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=124 + +# 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 + +# rebuild initrd to add early microcode updates +rebuild-initrd + +# This update needs 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/123/exclude b/config/rootfiles/oldcore/123/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/123/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/123/filelists/apache2 b/config/rootfiles/oldcore/123/filelists/apache2 similarity index 100% rename from config/rootfiles/core/123/filelists/apache2 rename to config/rootfiles/oldcore/123/filelists/apache2 diff --git a/config/rootfiles/core/123/filelists/conntrack-tools b/config/rootfiles/oldcore/123/filelists/conntrack-tools similarity index 100% rename from config/rootfiles/core/123/filelists/conntrack-tools rename to config/rootfiles/oldcore/123/filelists/conntrack-tools diff --git a/config/rootfiles/core/123/filelists/coreutils b/config/rootfiles/oldcore/123/filelists/coreutils similarity index 100% rename from config/rootfiles/core/123/filelists/coreutils rename to config/rootfiles/oldcore/123/filelists/coreutils diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/oldcore/123/filelists/files similarity index 100% rename from config/rootfiles/core/123/filelists/files rename to config/rootfiles/oldcore/123/filelists/files diff --git a/config/rootfiles/core/123/filelists/gnupg b/config/rootfiles/oldcore/123/filelists/gnupg similarity index 100% rename from config/rootfiles/core/123/filelists/gnupg rename to config/rootfiles/oldcore/123/filelists/gnupg diff --git a/config/rootfiles/core/123/filelists/i586/intel-microcode b/config/rootfiles/oldcore/123/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/123/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/123/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/123/filelists/iana-etc b/config/rootfiles/oldcore/123/filelists/iana-etc similarity index 100% rename from config/rootfiles/core/123/filelists/iana-etc rename to config/rootfiles/oldcore/123/filelists/iana-etc diff --git a/config/rootfiles/core/123/filelists/ipset b/config/rootfiles/oldcore/123/filelists/ipset similarity index 100% rename from config/rootfiles/core/123/filelists/ipset rename to config/rootfiles/oldcore/123/filelists/ipset diff --git a/config/rootfiles/core/123/filelists/iptables b/config/rootfiles/oldcore/123/filelists/iptables similarity index 100% rename from config/rootfiles/core/123/filelists/iptables rename to config/rootfiles/oldcore/123/filelists/iptables diff --git a/config/rootfiles/core/123/filelists/libgcrypt b/config/rootfiles/oldcore/123/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/123/filelists/libgcrypt rename to config/rootfiles/oldcore/123/filelists/libgcrypt diff --git a/config/rootfiles/core/123/filelists/linux-firmware-updates b/config/rootfiles/oldcore/123/filelists/linux-firmware-updates similarity index 100% rename from config/rootfiles/core/123/filelists/linux-firmware-updates rename to config/rootfiles/oldcore/123/filelists/linux-firmware-updates diff --git a/config/rootfiles/core/123/filelists/nss-myhostname b/config/rootfiles/oldcore/123/filelists/nss-myhostname similarity index 100% rename from config/rootfiles/core/123/filelists/nss-myhostname rename to config/rootfiles/oldcore/123/filelists/nss-myhostname diff --git a/config/rootfiles/core/123/filelists/openssl b/config/rootfiles/oldcore/123/filelists/openssl similarity index 100% rename from config/rootfiles/core/123/filelists/openssl rename to config/rootfiles/oldcore/123/filelists/openssl diff --git a/config/rootfiles/core/123/filelists/openssl-compat b/config/rootfiles/oldcore/123/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/123/filelists/openssl-compat rename to config/rootfiles/oldcore/123/filelists/openssl-compat diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/oldcore/123/filelists/squid similarity index 100% rename from config/rootfiles/core/123/filelists/squid rename to config/rootfiles/oldcore/123/filelists/squid diff --git a/config/rootfiles/core/123/filelists/strongswan b/config/rootfiles/oldcore/123/filelists/strongswan similarity index 100% rename from config/rootfiles/core/123/filelists/strongswan rename to config/rootfiles/oldcore/123/filelists/strongswan diff --git a/config/rootfiles/core/123/filelists/tzdata b/config/rootfiles/oldcore/123/filelists/tzdata similarity index 100% rename from config/rootfiles/core/123/filelists/tzdata rename to config/rootfiles/oldcore/123/filelists/tzdata diff --git a/config/rootfiles/core/123/filelists/unbound b/config/rootfiles/oldcore/123/filelists/unbound similarity index 100% rename from config/rootfiles/core/123/filelists/unbound rename to config/rootfiles/oldcore/123/filelists/unbound diff --git a/config/rootfiles/core/123/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/123/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/123/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/123/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/oldcore/123/update.sh similarity index 100% rename from config/rootfiles/core/123/update.sh rename to config/rootfiles/oldcore/123/update.sh diff --git a/make.sh b/make.sh index b8053a38f8..17b2d068b5 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="123" # Core Level (Filename) +CORE="124" # Core Level (Filename) PAKFIRE_CORE="123" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan