From 2a3506f3493a38609e787c9cf20718d233812584 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 26 Sep 2014 12:24:16 +0200 Subject: [PATCH] Create core update 84 --- config/rootfiles/core/{83 => 84}/exclude | 0 config/rootfiles/core/84/filelists/files | 2 + config/rootfiles/core/{83 => 84}/meta | 0 config/rootfiles/core/84/update.sh | 56 +++++++++++++++++++ .../{core => oldcore}/82/filelists/iputils | 0 .../82/filelists/openssl-compat | 0 config/rootfiles/oldcore/83/exclude | 20 +++++++ .../{core => oldcore}/83/filelists/bash | 0 .../{core => oldcore}/83/filelists/files | 0 .../{core => oldcore}/83/filelists/findutils | 0 .../{core => oldcore}/83/filelists/squid | 0 config/rootfiles/oldcore/83/meta | 1 + .../rootfiles/{core => oldcore}/83/update.sh | 0 make.sh | 2 +- 14 files changed, 80 insertions(+), 1 deletion(-) rename config/rootfiles/core/{83 => 84}/exclude (100%) create mode 100644 config/rootfiles/core/84/filelists/files rename config/rootfiles/core/{83 => 84}/meta (100%) create mode 100644 config/rootfiles/core/84/update.sh rename config/rootfiles/{core => oldcore}/82/filelists/iputils (100%) rename config/rootfiles/{core => oldcore}/82/filelists/openssl-compat (100%) create mode 100644 config/rootfiles/oldcore/83/exclude rename config/rootfiles/{core => oldcore}/83/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/83/filelists/files (100%) rename config/rootfiles/{core => oldcore}/83/filelists/findutils (100%) rename config/rootfiles/{core => oldcore}/83/filelists/squid (100%) create mode 100644 config/rootfiles/oldcore/83/meta rename config/rootfiles/{core => oldcore}/83/update.sh (100%) diff --git a/config/rootfiles/core/83/exclude b/config/rootfiles/core/84/exclude similarity index 100% rename from config/rootfiles/core/83/exclude rename to config/rootfiles/core/84/exclude diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/core/84/filelists/files new file mode 100644 index 000000000..409e5fe8a --- /dev/null +++ b/config/rootfiles/core/84/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/83/meta b/config/rootfiles/core/84/meta similarity index 100% rename from config/rootfiles/core/83/meta rename to config/rootfiles/core/84/meta diff --git a/config/rootfiles/core/84/update.sh b/config/rootfiles/core/84/update.sh new file mode 100644 index 000000000..04e6d8db9 --- /dev/null +++ b/config/rootfiles/core/84/update.sh @@ -0,0 +1,56 @@ +#!/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) 2014 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=84 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/82/filelists/iputils b/config/rootfiles/oldcore/82/filelists/iputils similarity index 100% rename from config/rootfiles/core/82/filelists/iputils rename to config/rootfiles/oldcore/82/filelists/iputils diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootfiles/oldcore/82/filelists/openssl-compat similarity index 100% rename from config/rootfiles/core/82/filelists/openssl-compat rename to config/rootfiles/oldcore/82/filelists/openssl-compat diff --git a/config/rootfiles/oldcore/83/exclude b/config/rootfiles/oldcore/83/exclude new file mode 100644 index 000000000..18e9b4d24 --- /dev/null +++ b/config/rootfiles/oldcore/83/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +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/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/83/filelists/bash b/config/rootfiles/oldcore/83/filelists/bash similarity index 100% rename from config/rootfiles/core/83/filelists/bash rename to config/rootfiles/oldcore/83/filelists/bash diff --git a/config/rootfiles/core/83/filelists/files b/config/rootfiles/oldcore/83/filelists/files similarity index 100% rename from config/rootfiles/core/83/filelists/files rename to config/rootfiles/oldcore/83/filelists/files diff --git a/config/rootfiles/core/83/filelists/findutils b/config/rootfiles/oldcore/83/filelists/findutils similarity index 100% rename from config/rootfiles/core/83/filelists/findutils rename to config/rootfiles/oldcore/83/filelists/findutils diff --git a/config/rootfiles/core/83/filelists/squid b/config/rootfiles/oldcore/83/filelists/squid similarity index 100% rename from config/rootfiles/core/83/filelists/squid rename to config/rootfiles/oldcore/83/filelists/squid diff --git a/config/rootfiles/oldcore/83/meta b/config/rootfiles/oldcore/83/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/oldcore/83/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/83/update.sh b/config/rootfiles/oldcore/83/update.sh similarity index 100% rename from config/rootfiles/core/83/update.sh rename to config/rootfiles/oldcore/83/update.sh diff --git a/make.sh b/make.sh index 9084df249..23ef2b66e 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="83" # Core Level (Filename) +CORE="84" # Core Level (Filename) PAKFIRE_CORE="83" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2