From: Arne Fitzenreiter Date: Mon, 9 Dec 2019 18:50:03 +0000 (+0100) Subject: core140: start X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a3acff9348cb755250ef9d763c73a73142f46e3;p=people%2Fms%2Fipfire-2.x.git core140: start Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/core/139/exclude b/config/rootfiles/core/140/exclude similarity index 100% rename from config/rootfiles/core/139/exclude rename to config/rootfiles/core/140/exclude diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files new file mode 100644 index 0000000000..ce4e517681 --- /dev/null +++ b/config/rootfiles/core/140/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/139/meta b/config/rootfiles/core/140/meta similarity index 100% rename from config/rootfiles/core/139/meta rename to config/rootfiles/core/140/meta diff --git a/config/rootfiles/core/140/update.sh b/config/rootfiles/core/140/update.sh new file mode 100644 index 0000000000..27b0329669 --- /dev/null +++ b/config/rootfiles/core/140/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=140 + +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/139/exclude b/config/rootfiles/oldcore/139/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/139/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/139/filelists/aarch64/python b/config/rootfiles/oldcore/139/filelists/aarch64/python similarity index 100% rename from config/rootfiles/core/139/filelists/aarch64/python rename to config/rootfiles/oldcore/139/filelists/aarch64/python diff --git a/config/rootfiles/core/139/filelists/armv5tel/python b/config/rootfiles/oldcore/139/filelists/armv5tel/python similarity index 100% rename from config/rootfiles/core/139/filelists/armv5tel/python rename to config/rootfiles/oldcore/139/filelists/armv5tel/python diff --git a/config/rootfiles/core/139/filelists/bash b/config/rootfiles/oldcore/139/filelists/bash similarity index 100% rename from config/rootfiles/core/139/filelists/bash rename to config/rootfiles/oldcore/139/filelists/bash diff --git a/config/rootfiles/core/139/filelists/ca-certificates b/config/rootfiles/oldcore/139/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/139/filelists/ca-certificates rename to config/rootfiles/oldcore/139/filelists/ca-certificates diff --git a/config/rootfiles/core/139/filelists/cpio b/config/rootfiles/oldcore/139/filelists/cpio similarity index 100% rename from config/rootfiles/core/139/filelists/cpio rename to config/rootfiles/oldcore/139/filelists/cpio diff --git a/config/rootfiles/core/139/filelists/ddns b/config/rootfiles/oldcore/139/filelists/ddns similarity index 100% rename from config/rootfiles/core/139/filelists/ddns rename to config/rootfiles/oldcore/139/filelists/ddns diff --git a/config/rootfiles/core/139/filelists/files b/config/rootfiles/oldcore/139/filelists/files similarity index 100% rename from config/rootfiles/core/139/filelists/files rename to config/rootfiles/oldcore/139/filelists/files diff --git a/config/rootfiles/core/139/filelists/hwdata b/config/rootfiles/oldcore/139/filelists/hwdata similarity index 100% rename from config/rootfiles/core/139/filelists/hwdata rename to config/rootfiles/oldcore/139/filelists/hwdata diff --git a/config/rootfiles/core/139/filelists/i586/intel-microcode b/config/rootfiles/oldcore/139/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/139/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/139/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/139/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/139/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/139/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/139/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/139/filelists/i586/python b/config/rootfiles/oldcore/139/filelists/i586/python similarity index 100% rename from config/rootfiles/core/139/filelists/i586/python rename to config/rootfiles/oldcore/139/filelists/i586/python diff --git a/config/rootfiles/core/139/filelists/linux-firmware-new_files b/config/rootfiles/oldcore/139/filelists/linux-firmware-new_files similarity index 100% rename from config/rootfiles/core/139/filelists/linux-firmware-new_files rename to config/rootfiles/oldcore/139/filelists/linux-firmware-new_files diff --git a/config/rootfiles/core/139/filelists/logwatch b/config/rootfiles/oldcore/139/filelists/logwatch similarity index 100% rename from config/rootfiles/core/139/filelists/logwatch rename to config/rootfiles/oldcore/139/filelists/logwatch diff --git a/config/rootfiles/core/139/filelists/lz4 b/config/rootfiles/oldcore/139/filelists/lz4 similarity index 100% rename from config/rootfiles/core/139/filelists/lz4 rename to config/rootfiles/oldcore/139/filelists/lz4 diff --git a/config/rootfiles/core/139/filelists/openssh b/config/rootfiles/oldcore/139/filelists/openssh similarity index 100% rename from config/rootfiles/core/139/filelists/openssh rename to config/rootfiles/oldcore/139/filelists/openssh diff --git a/config/rootfiles/core/139/filelists/openssl b/config/rootfiles/oldcore/139/filelists/openssl similarity index 100% rename from config/rootfiles/core/139/filelists/openssl rename to config/rootfiles/oldcore/139/filelists/openssl diff --git a/config/rootfiles/core/139/filelists/openvpn b/config/rootfiles/oldcore/139/filelists/openvpn similarity index 100% rename from config/rootfiles/core/139/filelists/openvpn rename to config/rootfiles/oldcore/139/filelists/openvpn diff --git a/config/rootfiles/core/139/filelists/readline b/config/rootfiles/oldcore/139/filelists/readline similarity index 100% rename from config/rootfiles/core/139/filelists/readline rename to config/rootfiles/oldcore/139/filelists/readline diff --git a/config/rootfiles/core/139/filelists/readline-compat b/config/rootfiles/oldcore/139/filelists/readline-compat similarity index 100% rename from config/rootfiles/core/139/filelists/readline-compat rename to config/rootfiles/oldcore/139/filelists/readline-compat diff --git a/config/rootfiles/core/139/filelists/squid b/config/rootfiles/oldcore/139/filelists/squid similarity index 100% rename from config/rootfiles/core/139/filelists/squid rename to config/rootfiles/oldcore/139/filelists/squid diff --git a/config/rootfiles/core/139/filelists/unbound b/config/rootfiles/oldcore/139/filelists/unbound similarity index 100% rename from config/rootfiles/core/139/filelists/unbound rename to config/rootfiles/oldcore/139/filelists/unbound diff --git a/config/rootfiles/core/139/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/139/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/139/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/139/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/139/filelists/x86_64/python b/config/rootfiles/oldcore/139/filelists/x86_64/python similarity index 100% rename from config/rootfiles/core/139/filelists/x86_64/python rename to config/rootfiles/oldcore/139/filelists/x86_64/python diff --git a/config/rootfiles/oldcore/139/meta b/config/rootfiles/oldcore/139/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/139/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/139/update.sh b/config/rootfiles/oldcore/139/update.sh similarity index 100% rename from config/rootfiles/core/139/update.sh rename to config/rootfiles/oldcore/139/update.sh diff --git a/make.sh b/make.sh index 94fd9679f3..64b08b7d9b 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="139" # Core Level (Filename) +CORE="140" # Core Level (Filename) PAKFIRE_CORE="139" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan