From: Michael Tremer Date: Mon, 21 Aug 2017 11:21:14 +0000 (+0100) Subject: Start Core Update 114 X-Git-Tag: v2.19-core114~1^2~29 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=05e7808cd6191465f9123ffee4374894ce5f7b4f Start Core Update 114 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/113/exclude b/config/rootfiles/core/114/exclude similarity index 100% rename from config/rootfiles/core/113/exclude rename to config/rootfiles/core/114/exclude diff --git a/config/rootfiles/core/114/filelists/files b/config/rootfiles/core/114/filelists/files new file mode 100644 index 0000000000..168c7d188b --- /dev/null +++ b/config/rootfiles/core/114/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/113/meta b/config/rootfiles/core/114/meta similarity index 100% rename from config/rootfiles/core/113/meta rename to config/rootfiles/core/114/meta diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh new file mode 100644 index 0000000000..3e2929e309 --- /dev/null +++ b/config/rootfiles/core/114/update.sh @@ -0,0 +1,64 @@ +#!/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=114 + +# 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 + +# Remove baudrate from inittab + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# This update need 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/113/exclude b/config/rootfiles/oldcore/113/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/113/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/113/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/113/filelists/armv5tel/util-linux similarity index 100% rename from config/rootfiles/core/113/filelists/armv5tel/util-linux rename to config/rootfiles/oldcore/113/filelists/armv5tel/util-linux diff --git a/config/rootfiles/core/113/filelists/files b/config/rootfiles/oldcore/113/filelists/files similarity index 100% rename from config/rootfiles/core/113/filelists/files rename to config/rootfiles/oldcore/113/filelists/files diff --git a/config/rootfiles/core/113/filelists/gnutls b/config/rootfiles/oldcore/113/filelists/gnutls similarity index 100% rename from config/rootfiles/core/113/filelists/gnutls rename to config/rootfiles/oldcore/113/filelists/gnutls diff --git a/config/rootfiles/core/113/filelists/grep b/config/rootfiles/oldcore/113/filelists/grep similarity index 100% rename from config/rootfiles/core/113/filelists/grep rename to config/rootfiles/oldcore/113/filelists/grep diff --git a/config/rootfiles/core/113/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/113/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/113/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/113/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/113/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/113/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/113/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/113/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/113/filelists/i586/util-linux b/config/rootfiles/oldcore/113/filelists/i586/util-linux similarity index 100% rename from config/rootfiles/core/113/filelists/i586/util-linux rename to config/rootfiles/oldcore/113/filelists/i586/util-linux diff --git a/config/rootfiles/core/113/filelists/libgcrypt b/config/rootfiles/oldcore/113/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/113/filelists/libgcrypt rename to config/rootfiles/oldcore/113/filelists/libgcrypt diff --git a/config/rootfiles/core/113/filelists/logrotate b/config/rootfiles/oldcore/113/filelists/logrotate similarity index 100% rename from config/rootfiles/core/113/filelists/logrotate rename to config/rootfiles/oldcore/113/filelists/logrotate diff --git a/config/rootfiles/core/113/filelists/mdadm b/config/rootfiles/oldcore/113/filelists/mdadm similarity index 100% rename from config/rootfiles/core/113/filelists/mdadm rename to config/rootfiles/oldcore/113/filelists/mdadm diff --git a/config/rootfiles/core/113/filelists/openssl b/config/rootfiles/oldcore/113/filelists/openssl similarity index 100% rename from config/rootfiles/core/113/filelists/openssl rename to config/rootfiles/oldcore/113/filelists/openssl diff --git a/config/rootfiles/core/113/filelists/openvpn b/config/rootfiles/oldcore/113/filelists/openvpn similarity index 100% rename from config/rootfiles/core/113/filelists/openvpn rename to config/rootfiles/oldcore/113/filelists/openvpn diff --git a/config/rootfiles/core/113/filelists/pcre b/config/rootfiles/oldcore/113/filelists/pcre similarity index 100% rename from config/rootfiles/core/113/filelists/pcre rename to config/rootfiles/oldcore/113/filelists/pcre diff --git a/config/rootfiles/core/113/filelists/squid b/config/rootfiles/oldcore/113/filelists/squid similarity index 100% rename from config/rootfiles/core/113/filelists/squid rename to config/rootfiles/oldcore/113/filelists/squid diff --git a/config/rootfiles/core/113/filelists/strongswan b/config/rootfiles/oldcore/113/filelists/strongswan similarity index 100% rename from config/rootfiles/core/113/filelists/strongswan rename to config/rootfiles/oldcore/113/filelists/strongswan diff --git a/config/rootfiles/core/113/filelists/unbound b/config/rootfiles/oldcore/113/filelists/unbound similarity index 100% rename from config/rootfiles/core/113/filelists/unbound rename to config/rootfiles/oldcore/113/filelists/unbound diff --git a/config/rootfiles/core/113/filelists/x86_64/util-linux b/config/rootfiles/oldcore/113/filelists/x86_64/util-linux similarity index 100% rename from config/rootfiles/core/113/filelists/x86_64/util-linux rename to config/rootfiles/oldcore/113/filelists/x86_64/util-linux diff --git a/config/rootfiles/oldcore/113/meta b/config/rootfiles/oldcore/113/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/113/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/113/update.sh b/config/rootfiles/oldcore/113/update.sh similarity index 100% rename from config/rootfiles/core/113/update.sh rename to config/rootfiles/oldcore/113/update.sh