From: Michael Tremer Date: Thu, 18 Oct 2018 13:28:33 +0000 (+0100) Subject: Start Core Update 125 X-Git-Tag: v2.21-core125~68 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7e2d7b98371fc203ccd764f76f35f57cc358ace4 Start Core Update 125 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/124/exclude b/config/rootfiles/core/125/exclude similarity index 100% rename from config/rootfiles/core/124/exclude rename to config/rootfiles/core/125/exclude diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/125/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh new file mode 100644 index 0000000000..eb468ac43f --- /dev/null +++ b/config/rootfiles/core/125/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=125 + +# 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 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/124/exclude b/config/rootfiles/oldcore/124/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/124/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/124/filelists/aarch64/efibootmgr b/config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/aarch64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/aarch64/efivar b/config/rootfiles/oldcore/124/filelists/aarch64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/efivar rename to config/rootfiles/oldcore/124/filelists/aarch64/efivar diff --git a/config/rootfiles/core/124/filelists/aarch64/files-aarch64 b/config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/files-aarch64 rename to config/rootfiles/oldcore/124/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/124/filelists/aarch64/grub b/config/rootfiles/oldcore/124/filelists/aarch64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/grub rename to config/rootfiles/oldcore/124/filelists/aarch64/grub diff --git a/config/rootfiles/core/124/filelists/aarch64/linux b/config/rootfiles/oldcore/124/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux rename to config/rootfiles/oldcore/124/filelists/aarch64/linux diff --git a/config/rootfiles/core/124/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel b/config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/files-armv5tel rename to config/rootfiles/oldcore/124/filelists/armv5tel/files-armv5tel diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/124/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/124/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/124/filelists/bind b/config/rootfiles/oldcore/124/filelists/bind similarity index 100% rename from config/rootfiles/core/124/filelists/bind rename to config/rootfiles/oldcore/124/filelists/bind diff --git a/config/rootfiles/core/124/filelists/ca-certificates b/config/rootfiles/oldcore/124/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/124/filelists/ca-certificates rename to config/rootfiles/oldcore/124/filelists/ca-certificates diff --git a/config/rootfiles/core/124/filelists/cdrkit b/config/rootfiles/oldcore/124/filelists/cdrkit similarity index 100% rename from config/rootfiles/core/124/filelists/cdrkit rename to config/rootfiles/oldcore/124/filelists/cdrkit diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/oldcore/124/filelists/files similarity index 100% rename from config/rootfiles/core/124/filelists/files rename to config/rootfiles/oldcore/124/filelists/files diff --git a/config/rootfiles/core/124/filelists/i586/grub b/config/rootfiles/oldcore/124/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/124/filelists/i586/grub rename to config/rootfiles/oldcore/124/filelists/i586/grub diff --git a/config/rootfiles/core/124/filelists/i586/linux b/config/rootfiles/oldcore/124/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux rename to config/rootfiles/oldcore/124/filelists/i586/linux diff --git a/config/rootfiles/core/124/filelists/i586/linux-initrd b/config/rootfiles/oldcore/124/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/124/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/124/filelists/iproute2 b/config/rootfiles/oldcore/124/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/124/filelists/iproute2 rename to config/rootfiles/oldcore/124/filelists/iproute2 diff --git a/config/rootfiles/core/124/filelists/ntp b/config/rootfiles/oldcore/124/filelists/ntp similarity index 100% rename from config/rootfiles/core/124/filelists/ntp rename to config/rootfiles/oldcore/124/filelists/ntp diff --git a/config/rootfiles/core/124/filelists/openssh b/config/rootfiles/oldcore/124/filelists/openssh similarity index 100% rename from config/rootfiles/core/124/filelists/openssh rename to config/rootfiles/oldcore/124/filelists/openssh diff --git a/config/rootfiles/core/124/filelists/parted b/config/rootfiles/oldcore/124/filelists/parted similarity index 100% rename from config/rootfiles/core/124/filelists/parted rename to config/rootfiles/oldcore/124/filelists/parted diff --git a/config/rootfiles/core/124/filelists/pciutils b/config/rootfiles/oldcore/124/filelists/pciutils similarity index 100% rename from config/rootfiles/core/124/filelists/pciutils rename to config/rootfiles/oldcore/124/filelists/pciutils diff --git a/config/rootfiles/core/124/filelists/rng-tools b/config/rootfiles/oldcore/124/filelists/rng-tools similarity index 100% rename from config/rootfiles/core/124/filelists/rng-tools rename to config/rootfiles/oldcore/124/filelists/rng-tools diff --git a/config/rootfiles/core/124/filelists/unbound b/config/rootfiles/oldcore/124/filelists/unbound similarity index 100% rename from config/rootfiles/core/124/filelists/unbound rename to config/rootfiles/oldcore/124/filelists/unbound diff --git a/config/rootfiles/core/124/filelists/x86_64/efibootmgr b/config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efibootmgr rename to config/rootfiles/oldcore/124/filelists/x86_64/efibootmgr diff --git a/config/rootfiles/core/124/filelists/x86_64/efivar b/config/rootfiles/oldcore/124/filelists/x86_64/efivar similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/efivar rename to config/rootfiles/oldcore/124/filelists/x86_64/efivar diff --git a/config/rootfiles/core/124/filelists/x86_64/grub b/config/rootfiles/oldcore/124/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/grub rename to config/rootfiles/oldcore/124/filelists/x86_64/grub diff --git a/config/rootfiles/core/124/filelists/x86_64/linux b/config/rootfiles/oldcore/124/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux rename to config/rootfiles/oldcore/124/filelists/x86_64/linux diff --git a/config/rootfiles/core/124/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/124/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/124/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/oldcore/124/update.sh similarity index 100% rename from config/rootfiles/core/124/update.sh rename to config/rootfiles/oldcore/124/update.sh diff --git a/make.sh b/make.sh index d8b7856cb7..c811f05731 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="124" # Core Level (Filename) +CORE="125" # Core Level (Filename) PAKFIRE_CORE="124" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan