From: Michael Tremer Date: Wed, 21 Feb 2018 12:20:57 +0000 (+0000) Subject: Start Core Update 120 X-Git-Tag: v2.19-core120~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb8a6bf5a4a2794638da37b992799e275022c78d;p=people%2Fstevee%2Fipfire-2.x.git Start Core Update 120 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/119/exclude b/config/rootfiles/core/120/exclude similarity index 100% rename from config/rootfiles/core/119/exclude rename to config/rootfiles/core/120/exclude diff --git a/config/rootfiles/core/120/filelists/files b/config/rootfiles/core/120/filelists/files new file mode 100644 index 0000000000..168c7d188b --- /dev/null +++ b/config/rootfiles/core/120/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/119/meta b/config/rootfiles/core/120/meta similarity index 100% rename from config/rootfiles/core/119/meta rename to config/rootfiles/core/120/meta diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh new file mode 100644 index 0000000000..9986316e9f --- /dev/null +++ b/config/rootfiles/core/120/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=120 + +# 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/119/exclude b/config/rootfiles/oldcore/119/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/119/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/119/filelists/armv5tel/binutils b/config/rootfiles/oldcore/119/filelists/armv5tel/binutils similarity index 100% rename from config/rootfiles/core/119/filelists/armv5tel/binutils rename to config/rootfiles/oldcore/119/filelists/armv5tel/binutils diff --git a/config/rootfiles/core/119/filelists/armv5tel/gcc b/config/rootfiles/oldcore/119/filelists/armv5tel/gcc similarity index 100% rename from config/rootfiles/core/119/filelists/armv5tel/gcc rename to config/rootfiles/oldcore/119/filelists/armv5tel/gcc diff --git a/config/rootfiles/core/119/filelists/armv5tel/glibc b/config/rootfiles/oldcore/119/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/119/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/119/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/119/filelists/dma b/config/rootfiles/oldcore/119/filelists/dma similarity index 100% rename from config/rootfiles/core/119/filelists/dma rename to config/rootfiles/oldcore/119/filelists/dma diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/oldcore/119/filelists/files similarity index 100% rename from config/rootfiles/core/119/filelists/files rename to config/rootfiles/oldcore/119/filelists/files diff --git a/config/rootfiles/core/119/filelists/hostname b/config/rootfiles/oldcore/119/filelists/hostname similarity index 100% rename from config/rootfiles/core/119/filelists/hostname rename to config/rootfiles/oldcore/119/filelists/hostname diff --git a/config/rootfiles/core/119/filelists/i2c-tools b/config/rootfiles/oldcore/119/filelists/i2c-tools similarity index 100% rename from config/rootfiles/core/119/filelists/i2c-tools rename to config/rootfiles/oldcore/119/filelists/i2c-tools diff --git a/config/rootfiles/core/119/filelists/i586/binutils b/config/rootfiles/oldcore/119/filelists/i586/binutils similarity index 100% rename from config/rootfiles/core/119/filelists/i586/binutils rename to config/rootfiles/oldcore/119/filelists/i586/binutils diff --git a/config/rootfiles/core/119/filelists/i586/gcc b/config/rootfiles/oldcore/119/filelists/i586/gcc similarity index 100% rename from config/rootfiles/core/119/filelists/i586/gcc rename to config/rootfiles/oldcore/119/filelists/i586/gcc diff --git a/config/rootfiles/core/119/filelists/i586/glibc b/config/rootfiles/oldcore/119/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/119/filelists/i586/glibc rename to config/rootfiles/oldcore/119/filelists/i586/glibc diff --git a/config/rootfiles/core/119/filelists/iproute2 b/config/rootfiles/oldcore/119/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/119/filelists/iproute2 rename to config/rootfiles/oldcore/119/filelists/iproute2 diff --git a/config/rootfiles/core/119/filelists/pam b/config/rootfiles/oldcore/119/filelists/pam similarity index 100% rename from config/rootfiles/core/119/filelists/pam rename to config/rootfiles/oldcore/119/filelists/pam diff --git a/config/rootfiles/core/119/filelists/setup b/config/rootfiles/oldcore/119/filelists/setup similarity index 100% rename from config/rootfiles/core/119/filelists/setup rename to config/rootfiles/oldcore/119/filelists/setup diff --git a/config/rootfiles/core/119/filelists/strongswan b/config/rootfiles/oldcore/119/filelists/strongswan similarity index 100% rename from config/rootfiles/core/119/filelists/strongswan rename to config/rootfiles/oldcore/119/filelists/strongswan diff --git a/config/rootfiles/core/119/filelists/x86_64/binutils b/config/rootfiles/oldcore/119/filelists/x86_64/binutils similarity index 100% rename from config/rootfiles/core/119/filelists/x86_64/binutils rename to config/rootfiles/oldcore/119/filelists/x86_64/binutils diff --git a/config/rootfiles/core/119/filelists/x86_64/gcc b/config/rootfiles/oldcore/119/filelists/x86_64/gcc similarity index 100% rename from config/rootfiles/core/119/filelists/x86_64/gcc rename to config/rootfiles/oldcore/119/filelists/x86_64/gcc diff --git a/config/rootfiles/core/119/filelists/x86_64/glibc b/config/rootfiles/oldcore/119/filelists/x86_64/glibc similarity index 100% rename from config/rootfiles/core/119/filelists/x86_64/glibc rename to config/rootfiles/oldcore/119/filelists/x86_64/glibc diff --git a/config/rootfiles/oldcore/119/meta b/config/rootfiles/oldcore/119/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/119/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/oldcore/119/update.sh similarity index 100% rename from config/rootfiles/core/119/update.sh rename to config/rootfiles/oldcore/119/update.sh diff --git a/make.sh b/make.sh index b85910ad45..44c18fee78 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="119" # Core Level (Filename) -PAKFIRE_CORE="118" # Core Level (PAKFIRE) +CORE="120" # Core Level (Filename) +PAKFIRE_CORE="119" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir