From b6c0145236385bcef7b3fa016f2884f64a2bc9f0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 16 Jun 2016 09:24:22 +0100 Subject: [PATCH] Start Core Update 104 Signed-off-by: Michael Tremer --- config/rootfiles/core/{103 => 104}/exclude | 0 config/rootfiles/core/104/filelists/files | 2 + config/rootfiles/core/{103 => 104}/meta | 0 config/rootfiles/core/104/update.sh | 71 +++++++++++++++++++ config/rootfiles/oldcore/103/exclude | 28 ++++++++ .../{core => oldcore}/103/filelists/coreutils | 0 .../{core => oldcore}/103/filelists/curl | 0 .../{core => oldcore}/103/filelists/diffutils | 0 .../{core => oldcore}/103/filelists/dnsmasq | 0 .../{core => oldcore}/103/filelists/files | 0 .../{core => oldcore}/103/filelists/findutils | 0 .../{core => oldcore}/103/filelists/gawk | 0 .../{core => oldcore}/103/filelists/gettext | 0 .../{core => oldcore}/103/filelists/grep | 0 .../{core => oldcore}/103/filelists/less | 0 .../{core => oldcore}/103/filelists/ncurses | 0 .../103/filelists/ncurses-compat | 0 .../{core => oldcore}/103/filelists/procps | 0 .../{core => oldcore}/103/filelists/sdparm | 0 .../{core => oldcore}/103/filelists/squid | 0 .../{core => oldcore}/103/filelists/tzdata | 0 .../103/filelists/wpa_supplicant | 0 config/rootfiles/oldcore/103/meta | 1 + .../rootfiles/{core => oldcore}/103/update.sh | 0 make.sh | 2 +- 25 files changed, 103 insertions(+), 1 deletion(-) rename config/rootfiles/core/{103 => 104}/exclude (100%) create mode 100644 config/rootfiles/core/104/filelists/files rename config/rootfiles/core/{103 => 104}/meta (100%) create mode 100644 config/rootfiles/core/104/update.sh create mode 100644 config/rootfiles/oldcore/103/exclude rename config/rootfiles/{core => oldcore}/103/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/103/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/103/filelists/files (100%) rename config/rootfiles/{core => oldcore}/103/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/103/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/103/filelists/grep (100%) rename config/rootfiles/{core => oldcore}/103/filelists/less (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses (100%) rename config/rootfiles/{core => oldcore}/103/filelists/ncurses-compat (100%) rename config/rootfiles/{core => oldcore}/103/filelists/procps (100%) rename config/rootfiles/{core => oldcore}/103/filelists/sdparm (100%) rename config/rootfiles/{core => oldcore}/103/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/103/filelists/tzdata (100%) rename config/rootfiles/{core => oldcore}/103/filelists/wpa_supplicant (100%) create mode 100644 config/rootfiles/oldcore/103/meta rename config/rootfiles/{core => oldcore}/103/update.sh (100%) diff --git a/config/rootfiles/core/103/exclude b/config/rootfiles/core/104/exclude similarity index 100% rename from config/rootfiles/core/103/exclude rename to config/rootfiles/core/104/exclude diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/104/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/103/meta b/config/rootfiles/core/104/meta similarity index 100% rename from config/rootfiles/core/103/meta rename to config/rootfiles/core/104/meta diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh new file mode 100644 index 0000000000..a229864ac4 --- /dev/null +++ b/config/rootfiles/core/104/update.sh @@ -0,0 +1,71 @@ +#!/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) 2016 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=104 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /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 + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +touch /var/run/need_reboot +sync + +# 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/103/exclude b/config/rootfiles/oldcore/103/exclude new file mode 100644 index 0000000000..7ddeae0ba3 --- /dev/null +++ b/config/rootfiles/oldcore/103/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/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/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/103/filelists/coreutils b/config/rootfiles/oldcore/103/filelists/coreutils similarity index 100% rename from config/rootfiles/core/103/filelists/coreutils rename to config/rootfiles/oldcore/103/filelists/coreutils diff --git a/config/rootfiles/core/103/filelists/curl b/config/rootfiles/oldcore/103/filelists/curl similarity index 100% rename from config/rootfiles/core/103/filelists/curl rename to config/rootfiles/oldcore/103/filelists/curl diff --git a/config/rootfiles/core/103/filelists/diffutils b/config/rootfiles/oldcore/103/filelists/diffutils similarity index 100% rename from config/rootfiles/core/103/filelists/diffutils rename to config/rootfiles/oldcore/103/filelists/diffutils diff --git a/config/rootfiles/core/103/filelists/dnsmasq b/config/rootfiles/oldcore/103/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/103/filelists/dnsmasq rename to config/rootfiles/oldcore/103/filelists/dnsmasq diff --git a/config/rootfiles/core/103/filelists/files b/config/rootfiles/oldcore/103/filelists/files similarity index 100% rename from config/rootfiles/core/103/filelists/files rename to config/rootfiles/oldcore/103/filelists/files diff --git a/config/rootfiles/core/103/filelists/findutils b/config/rootfiles/oldcore/103/filelists/findutils similarity index 100% rename from config/rootfiles/core/103/filelists/findutils rename to config/rootfiles/oldcore/103/filelists/findutils diff --git a/config/rootfiles/core/103/filelists/gawk b/config/rootfiles/oldcore/103/filelists/gawk similarity index 100% rename from config/rootfiles/core/103/filelists/gawk rename to config/rootfiles/oldcore/103/filelists/gawk diff --git a/config/rootfiles/core/103/filelists/gettext b/config/rootfiles/oldcore/103/filelists/gettext similarity index 100% rename from config/rootfiles/core/103/filelists/gettext rename to config/rootfiles/oldcore/103/filelists/gettext diff --git a/config/rootfiles/core/103/filelists/grep b/config/rootfiles/oldcore/103/filelists/grep similarity index 100% rename from config/rootfiles/core/103/filelists/grep rename to config/rootfiles/oldcore/103/filelists/grep diff --git a/config/rootfiles/core/103/filelists/less b/config/rootfiles/oldcore/103/filelists/less similarity index 100% rename from config/rootfiles/core/103/filelists/less rename to config/rootfiles/oldcore/103/filelists/less diff --git a/config/rootfiles/core/103/filelists/ncurses b/config/rootfiles/oldcore/103/filelists/ncurses similarity index 100% rename from config/rootfiles/core/103/filelists/ncurses rename to config/rootfiles/oldcore/103/filelists/ncurses diff --git a/config/rootfiles/core/103/filelists/ncurses-compat b/config/rootfiles/oldcore/103/filelists/ncurses-compat similarity index 100% rename from config/rootfiles/core/103/filelists/ncurses-compat rename to config/rootfiles/oldcore/103/filelists/ncurses-compat diff --git a/config/rootfiles/core/103/filelists/procps b/config/rootfiles/oldcore/103/filelists/procps similarity index 100% rename from config/rootfiles/core/103/filelists/procps rename to config/rootfiles/oldcore/103/filelists/procps diff --git a/config/rootfiles/core/103/filelists/sdparm b/config/rootfiles/oldcore/103/filelists/sdparm similarity index 100% rename from config/rootfiles/core/103/filelists/sdparm rename to config/rootfiles/oldcore/103/filelists/sdparm diff --git a/config/rootfiles/core/103/filelists/squid b/config/rootfiles/oldcore/103/filelists/squid similarity index 100% rename from config/rootfiles/core/103/filelists/squid rename to config/rootfiles/oldcore/103/filelists/squid diff --git a/config/rootfiles/core/103/filelists/tzdata b/config/rootfiles/oldcore/103/filelists/tzdata similarity index 100% rename from config/rootfiles/core/103/filelists/tzdata rename to config/rootfiles/oldcore/103/filelists/tzdata diff --git a/config/rootfiles/core/103/filelists/wpa_supplicant b/config/rootfiles/oldcore/103/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/103/filelists/wpa_supplicant rename to config/rootfiles/oldcore/103/filelists/wpa_supplicant diff --git a/config/rootfiles/oldcore/103/meta b/config/rootfiles/oldcore/103/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/103/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/oldcore/103/update.sh similarity index 100% rename from config/rootfiles/core/103/update.sh rename to config/rootfiles/oldcore/103/update.sh diff --git a/make.sh b/make.sh index 1945a5558d..3d5b4a3a60 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="103" # Core Level (Filename) +CORE="104" # Core Level (Filename) PAKFIRE_CORE="103" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2