From: Michael Tremer Date: Thu, 17 Jan 2019 14:38:01 +0000 (+0000) Subject: Start Core Update 128 X-Git-Tag: v2.21-core128~84 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5a394647545be13285bded059607cd86c4d551e6 Start Core Update 128 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/127/exclude b/config/rootfiles/core/128/exclude similarity index 100% rename from config/rootfiles/core/127/exclude rename to config/rootfiles/core/128/exclude diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files new file mode 100644 index 0000000000..ce4e517681 --- /dev/null +++ b/config/rootfiles/core/128/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh new file mode 100644 index 0000000000..ad95096725 --- /dev/null +++ b/config/rootfiles/core/128/update.sh @@ -0,0 +1,61 @@ +#!/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) 2018 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=128 + +# 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 + +# Remove files + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# 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/127/exclude b/config/rootfiles/oldcore/127/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/127/exclude @@ -0,0 +1,28 @@ +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/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/127/filelists/aarch64/files b/config/rootfiles/oldcore/127/filelists/aarch64/files similarity index 100% rename from config/rootfiles/core/127/filelists/aarch64/files rename to config/rootfiles/oldcore/127/filelists/aarch64/files diff --git a/config/rootfiles/core/127/filelists/aarch64/grub b/config/rootfiles/oldcore/127/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/127/filelists/aarch64/grub rename to config/rootfiles/oldcore/127/filelists/aarch64/grub diff --git a/config/rootfiles/core/127/filelists/aarch64/python b/config/rootfiles/oldcore/127/filelists/aarch64/python similarity index 100% rename from config/rootfiles/core/127/filelists/aarch64/python rename to config/rootfiles/oldcore/127/filelists/aarch64/python diff --git a/config/rootfiles/core/127/filelists/aarch64/xtables-addons-kmod b/config/rootfiles/oldcore/127/filelists/aarch64/xtables-addons-kmod similarity index 100% rename from config/rootfiles/core/127/filelists/aarch64/xtables-addons-kmod rename to config/rootfiles/oldcore/127/filelists/aarch64/xtables-addons-kmod diff --git a/config/rootfiles/core/127/filelists/armv5tel/files b/config/rootfiles/oldcore/127/filelists/armv5tel/files similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/files rename to config/rootfiles/oldcore/127/filelists/armv5tel/files diff --git a/config/rootfiles/core/127/filelists/armv5tel/python b/config/rootfiles/oldcore/127/filelists/armv5tel/python similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/python rename to config/rootfiles/oldcore/127/filelists/armv5tel/python diff --git a/config/rootfiles/core/127/filelists/armv5tel/xtables-addons-kmod-kirkwood b/config/rootfiles/oldcore/127/filelists/armv5tel/xtables-addons-kmod-kirkwood similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/xtables-addons-kmod-kirkwood rename to config/rootfiles/oldcore/127/filelists/armv5tel/xtables-addons-kmod-kirkwood diff --git a/config/rootfiles/core/127/filelists/armv5tel/xtables-addons-kmod-multi b/config/rootfiles/oldcore/127/filelists/armv5tel/xtables-addons-kmod-multi similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/xtables-addons-kmod-multi rename to config/rootfiles/oldcore/127/filelists/armv5tel/xtables-addons-kmod-multi diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/oldcore/127/filelists/files similarity index 100% rename from config/rootfiles/core/127/filelists/files rename to config/rootfiles/oldcore/127/filelists/files diff --git a/config/rootfiles/core/127/filelists/fireinfo b/config/rootfiles/oldcore/127/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/127/filelists/fireinfo rename to config/rootfiles/oldcore/127/filelists/fireinfo diff --git a/config/rootfiles/core/127/filelists/i586/grub b/config/rootfiles/oldcore/127/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/127/filelists/i586/grub rename to config/rootfiles/oldcore/127/filelists/i586/grub diff --git a/config/rootfiles/core/127/filelists/i586/python b/config/rootfiles/oldcore/127/filelists/i586/python similarity index 100% rename from config/rootfiles/core/127/filelists/i586/python rename to config/rootfiles/oldcore/127/filelists/i586/python diff --git a/config/rootfiles/core/127/filelists/i586/xtables-addons-kmod b/config/rootfiles/oldcore/127/filelists/i586/xtables-addons-kmod similarity index 100% rename from config/rootfiles/core/127/filelists/i586/xtables-addons-kmod rename to config/rootfiles/oldcore/127/filelists/i586/xtables-addons-kmod diff --git a/config/rootfiles/core/127/filelists/pcre b/config/rootfiles/oldcore/127/filelists/pcre similarity index 100% rename from config/rootfiles/core/127/filelists/pcre rename to config/rootfiles/oldcore/127/filelists/pcre diff --git a/config/rootfiles/core/127/filelists/perl-Net-CIDR-Lite b/config/rootfiles/oldcore/127/filelists/perl-Net-CIDR-Lite similarity index 100% rename from config/rootfiles/core/127/filelists/perl-Net-CIDR-Lite rename to config/rootfiles/oldcore/127/filelists/perl-Net-CIDR-Lite diff --git a/config/rootfiles/core/127/filelists/snort b/config/rootfiles/oldcore/127/filelists/snort similarity index 100% rename from config/rootfiles/core/127/filelists/snort rename to config/rootfiles/oldcore/127/filelists/snort diff --git a/config/rootfiles/core/127/filelists/sqlite b/config/rootfiles/oldcore/127/filelists/sqlite similarity index 100% rename from config/rootfiles/core/127/filelists/sqlite rename to config/rootfiles/oldcore/127/filelists/sqlite diff --git a/config/rootfiles/core/127/filelists/squid b/config/rootfiles/oldcore/127/filelists/squid similarity index 100% rename from config/rootfiles/core/127/filelists/squid rename to config/rootfiles/oldcore/127/filelists/squid diff --git a/config/rootfiles/core/127/filelists/tar b/config/rootfiles/oldcore/127/filelists/tar similarity index 100% rename from config/rootfiles/core/127/filelists/tar rename to config/rootfiles/oldcore/127/filelists/tar diff --git a/config/rootfiles/core/127/filelists/unbound b/config/rootfiles/oldcore/127/filelists/unbound similarity index 100% rename from config/rootfiles/core/127/filelists/unbound rename to config/rootfiles/oldcore/127/filelists/unbound diff --git a/config/rootfiles/core/127/filelists/wget b/config/rootfiles/oldcore/127/filelists/wget similarity index 100% rename from config/rootfiles/core/127/filelists/wget rename to config/rootfiles/oldcore/127/filelists/wget diff --git a/config/rootfiles/core/127/filelists/x86_64/grub b/config/rootfiles/oldcore/127/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/127/filelists/x86_64/grub rename to config/rootfiles/oldcore/127/filelists/x86_64/grub diff --git a/config/rootfiles/core/127/filelists/x86_64/python b/config/rootfiles/oldcore/127/filelists/x86_64/python similarity index 100% rename from config/rootfiles/core/127/filelists/x86_64/python rename to config/rootfiles/oldcore/127/filelists/x86_64/python diff --git a/config/rootfiles/core/127/filelists/x86_64/xtables-addons-kmod b/config/rootfiles/oldcore/127/filelists/x86_64/xtables-addons-kmod similarity index 100% rename from config/rootfiles/core/127/filelists/x86_64/xtables-addons-kmod rename to config/rootfiles/oldcore/127/filelists/x86_64/xtables-addons-kmod diff --git a/config/rootfiles/core/127/filelists/xtables-addons b/config/rootfiles/oldcore/127/filelists/xtables-addons similarity index 100% rename from config/rootfiles/core/127/filelists/xtables-addons rename to config/rootfiles/oldcore/127/filelists/xtables-addons diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/oldcore/127/update.sh similarity index 100% rename from config/rootfiles/core/127/update.sh rename to config/rootfiles/oldcore/127/update.sh diff --git a/make.sh b/make.sh index 1ee4ba36e7..7d13da95c9 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="127" # Core Level (Filename) +CORE="128" # Core Level (Filename) PAKFIRE_CORE="127" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan