From 85dfdf5d256665ede608f2f5885afc5e70615667 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 11 Aug 2019 10:54:14 +0200 Subject: [PATCH] start core136 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{135 => 136}/exclude | 0 config/rootfiles/core/136/filelists/files | 4 + config/rootfiles/core/136/update.sh | 75 +++++++++++++++++++ config/rootfiles/oldcore/135/exclude | 28 +++++++ .../135/filelists/aarch64/linux | 0 .../135/filelists/aarch64/linux-initrd | 0 .../135/filelists/aarch64/u-boot | 0 .../filelists/armv5tel/linux-initrd-kirkwood | 0 .../135/filelists/armv5tel/linux-initrd-multi | 0 .../135/filelists/armv5tel/linux-kirkwood | 0 .../135/filelists/armv5tel/linux-multi | 0 .../135/filelists/armv5tel/u-boot | 0 .../135/filelists/armv5tel/u-boot-friendlyarm | 0 .../{core => oldcore}/135/filelists/ddns | 0 .../{core => oldcore}/135/filelists/dhcpcd | 0 .../{core => oldcore}/135/filelists/files | 0 .../135/filelists/i586/linux | 0 .../135/filelists/i586/linux-initrd | 0 .../{core => oldcore}/135/filelists/nettle | 0 .../{core => oldcore}/135/filelists/squid | 0 .../{core => oldcore}/135/filelists/tzdata | 0 .../135/filelists/x86_64/linux | 0 .../135/filelists/x86_64/linux-initrd | 0 .../135/filelists/x86_64/sysctl-x86_64 | 0 .../rootfiles/{core => oldcore}/135/update.sh | 0 make.sh | 2 +- 26 files changed, 108 insertions(+), 1 deletion(-) rename config/rootfiles/core/{135 => 136}/exclude (100%) create mode 100644 config/rootfiles/core/136/filelists/files create mode 100644 config/rootfiles/core/136/update.sh create mode 100644 config/rootfiles/oldcore/135/exclude rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/135/filelists/aarch64/u-boot (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/135/filelists/armv5tel/u-boot-friendlyarm (100%) rename config/rootfiles/{core => oldcore}/135/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/135/filelists/dhcpcd (100%) rename config/rootfiles/{core => oldcore}/135/filelists/files (100%) rename config/rootfiles/{core => oldcore}/135/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/135/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/135/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/135/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/135/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/135/filelists/x86_64/sysctl-x86_64 (100%) rename config/rootfiles/{core => oldcore}/135/update.sh (100%) diff --git a/config/rootfiles/core/135/exclude b/config/rootfiles/core/136/exclude similarity index 100% rename from config/rootfiles/core/135/exclude rename to config/rootfiles/core/136/exclude diff --git a/config/rootfiles/core/136/filelists/files b/config/rootfiles/core/136/filelists/files new file mode 100644 index 0000000000..ce4e517681 --- /dev/null +++ b/config/rootfiles/core/136/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/136/update.sh b/config/rootfiles/core/136/update.sh new file mode 100644 index 0000000000..2de4cf5b8f --- /dev/null +++ b/config/rootfiles/core/136/update.sh @@ -0,0 +1,75 @@ +#!/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) 2019 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=136 + +exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + # don't start pakfire again at error + killall -KILL pak_update + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# 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 + + +# Remove files + +# 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/135/exclude b/config/rootfiles/oldcore/135/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/135/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/135/filelists/aarch64/linux b/config/rootfiles/oldcore/135/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/135/filelists/aarch64/linux rename to config/rootfiles/oldcore/135/filelists/aarch64/linux diff --git a/config/rootfiles/core/135/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/135/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/135/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/135/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/135/filelists/aarch64/u-boot b/config/rootfiles/oldcore/135/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/135/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/135/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/135/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/135/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/135/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/135/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/135/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/135/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/135/filelists/armv5tel/u-boot-friendlyarm b/config/rootfiles/oldcore/135/filelists/armv5tel/u-boot-friendlyarm similarity index 100% rename from config/rootfiles/core/135/filelists/armv5tel/u-boot-friendlyarm rename to config/rootfiles/oldcore/135/filelists/armv5tel/u-boot-friendlyarm diff --git a/config/rootfiles/core/135/filelists/ddns b/config/rootfiles/oldcore/135/filelists/ddns similarity index 100% rename from config/rootfiles/core/135/filelists/ddns rename to config/rootfiles/oldcore/135/filelists/ddns diff --git a/config/rootfiles/core/135/filelists/dhcpcd b/config/rootfiles/oldcore/135/filelists/dhcpcd similarity index 100% rename from config/rootfiles/core/135/filelists/dhcpcd rename to config/rootfiles/oldcore/135/filelists/dhcpcd diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/oldcore/135/filelists/files similarity index 100% rename from config/rootfiles/core/135/filelists/files rename to config/rootfiles/oldcore/135/filelists/files diff --git a/config/rootfiles/core/135/filelists/i586/linux b/config/rootfiles/oldcore/135/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/135/filelists/i586/linux rename to config/rootfiles/oldcore/135/filelists/i586/linux diff --git a/config/rootfiles/core/135/filelists/i586/linux-initrd b/config/rootfiles/oldcore/135/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/135/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/135/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/135/filelists/nettle b/config/rootfiles/oldcore/135/filelists/nettle similarity index 100% rename from config/rootfiles/core/135/filelists/nettle rename to config/rootfiles/oldcore/135/filelists/nettle diff --git a/config/rootfiles/core/135/filelists/squid b/config/rootfiles/oldcore/135/filelists/squid similarity index 100% rename from config/rootfiles/core/135/filelists/squid rename to config/rootfiles/oldcore/135/filelists/squid diff --git a/config/rootfiles/core/135/filelists/tzdata b/config/rootfiles/oldcore/135/filelists/tzdata similarity index 100% rename from config/rootfiles/core/135/filelists/tzdata rename to config/rootfiles/oldcore/135/filelists/tzdata diff --git a/config/rootfiles/core/135/filelists/x86_64/linux b/config/rootfiles/oldcore/135/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/135/filelists/x86_64/linux rename to config/rootfiles/oldcore/135/filelists/x86_64/linux diff --git a/config/rootfiles/core/135/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/135/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/135/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/135/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/135/filelists/x86_64/sysctl-x86_64 b/config/rootfiles/oldcore/135/filelists/x86_64/sysctl-x86_64 similarity index 100% rename from config/rootfiles/core/135/filelists/x86_64/sysctl-x86_64 rename to config/rootfiles/oldcore/135/filelists/x86_64/sysctl-x86_64 diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/oldcore/135/update.sh similarity index 100% rename from config/rootfiles/core/135/update.sh rename to config/rootfiles/oldcore/135/update.sh diff --git a/make.sh b/make.sh index 9d5e561bca..bf0f3a19ee 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.23" # Version number -CORE="135" # Core Level (Filename) +CORE="136" # Core Level (Filename) PAKFIRE_CORE="135" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2