From cfac8f9476678259698b14463fdd0c1b3ffeff23 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 11 Nov 2015 14:49:02 +0100 Subject: [PATCH] start core96 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{95 => 96}/exclude | 0 config/rootfiles/core/96/filelists/files | 2 + config/rootfiles/core/{95 => 96}/meta | 0 config/rootfiles/core/96/update.sh | 60 +++++++++++++++++++ config/rootfiles/oldcore/95/exclude | 24 ++++++++ .../95/filelists/armv5tel/linux-kirkwood | 0 .../95/filelists/armv5tel/linux-multi | 0 .../95/filelists/armv5tel/linux-rpi | 0 .../{core => oldcore}/95/filelists/ddns | 0 .../{core => oldcore}/95/filelists/dma | 0 .../{core => oldcore}/95/filelists/files | 0 .../{core => oldcore}/95/filelists/i586/linux | 0 .../95/filelists/i586/linux-initrd | 0 .../95/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/95/filelists/ipset | 0 .../{core => oldcore}/95/filelists/lzo | 0 .../{core => oldcore}/95/filelists/ntp | 0 .../{core => oldcore}/95/filelists/snort | 0 .../{core => oldcore}/95/filelists/strongswan | 0 .../95/filelists/x86_64/linux | 0 .../95/filelists/x86_64/linux-initrd | 0 config/rootfiles/oldcore/95/meta | 1 + .../rootfiles/{core => oldcore}/95/update.sh | 0 make.sh | 2 +- 24 files changed, 88 insertions(+), 1 deletion(-) rename config/rootfiles/core/{95 => 96}/exclude (100%) create mode 100644 config/rootfiles/core/96/filelists/files rename config/rootfiles/core/{95 => 96}/meta (100%) create mode 100644 config/rootfiles/core/96/update.sh create mode 100644 config/rootfiles/oldcore/95/exclude rename config/rootfiles/{core => oldcore}/95/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/{core => oldcore}/95/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/95/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/{core => oldcore}/95/filelists/ddns (100%) rename config/rootfiles/{core => oldcore}/95/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/95/filelists/files (100%) rename config/rootfiles/{core => oldcore}/95/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/95/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/95/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/95/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/95/filelists/lzo (100%) rename config/rootfiles/{core => oldcore}/95/filelists/ntp (100%) rename config/rootfiles/{core => oldcore}/95/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/95/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/95/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/95/filelists/x86_64/linux-initrd (100%) create mode 100644 config/rootfiles/oldcore/95/meta rename config/rootfiles/{core => oldcore}/95/update.sh (100%) diff --git a/config/rootfiles/core/95/exclude b/config/rootfiles/core/96/exclude similarity index 100% rename from config/rootfiles/core/95/exclude rename to config/rootfiles/core/96/exclude diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/96/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/95/meta b/config/rootfiles/core/96/meta similarity index 100% rename from config/rootfiles/core/95/meta rename to config/rootfiles/core/96/meta diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh new file mode 100644 index 0000000000..f40a0756ae --- /dev/null +++ b/config/rootfiles/core/96/update.sh @@ -0,0 +1,60 @@ +#!/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) 2015 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=96 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Update Language cache +# /usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/dnsmasq start +/etc/init.d/sshd start +/etc/init.d/squid start + +# 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/95/exclude b/config/rootfiles/oldcore/95/exclude new file mode 100644 index 0000000000..fe5e6a52ea --- /dev/null +++ b/config/rootfiles/oldcore/95/exclude @@ -0,0 +1,24 @@ +boot/config.txt +etc/alternatives +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/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/95/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/95/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/95/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/95/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/95/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/95/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/95/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/95/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/95/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/95/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/95/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/95/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/95/filelists/ddns b/config/rootfiles/oldcore/95/filelists/ddns similarity index 100% rename from config/rootfiles/core/95/filelists/ddns rename to config/rootfiles/oldcore/95/filelists/ddns diff --git a/config/rootfiles/core/95/filelists/dma b/config/rootfiles/oldcore/95/filelists/dma similarity index 100% rename from config/rootfiles/core/95/filelists/dma rename to config/rootfiles/oldcore/95/filelists/dma diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/oldcore/95/filelists/files similarity index 100% rename from config/rootfiles/core/95/filelists/files rename to config/rootfiles/oldcore/95/filelists/files diff --git a/config/rootfiles/core/95/filelists/i586/linux b/config/rootfiles/oldcore/95/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/95/filelists/i586/linux rename to config/rootfiles/oldcore/95/filelists/i586/linux diff --git a/config/rootfiles/core/95/filelists/i586/linux-initrd b/config/rootfiles/oldcore/95/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/95/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/95/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/95/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/95/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/95/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/95/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/95/filelists/ipset b/config/rootfiles/oldcore/95/filelists/ipset similarity index 100% rename from config/rootfiles/core/95/filelists/ipset rename to config/rootfiles/oldcore/95/filelists/ipset diff --git a/config/rootfiles/core/95/filelists/lzo b/config/rootfiles/oldcore/95/filelists/lzo similarity index 100% rename from config/rootfiles/core/95/filelists/lzo rename to config/rootfiles/oldcore/95/filelists/lzo diff --git a/config/rootfiles/core/95/filelists/ntp b/config/rootfiles/oldcore/95/filelists/ntp similarity index 100% rename from config/rootfiles/core/95/filelists/ntp rename to config/rootfiles/oldcore/95/filelists/ntp diff --git a/config/rootfiles/core/95/filelists/snort b/config/rootfiles/oldcore/95/filelists/snort similarity index 100% rename from config/rootfiles/core/95/filelists/snort rename to config/rootfiles/oldcore/95/filelists/snort diff --git a/config/rootfiles/core/95/filelists/strongswan b/config/rootfiles/oldcore/95/filelists/strongswan similarity index 100% rename from config/rootfiles/core/95/filelists/strongswan rename to config/rootfiles/oldcore/95/filelists/strongswan diff --git a/config/rootfiles/core/95/filelists/x86_64/linux b/config/rootfiles/oldcore/95/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/95/filelists/x86_64/linux rename to config/rootfiles/oldcore/95/filelists/x86_64/linux diff --git a/config/rootfiles/core/95/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/95/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/95/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/95/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/oldcore/95/meta b/config/rootfiles/oldcore/95/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/95/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/oldcore/95/update.sh similarity index 100% rename from config/rootfiles/core/95/update.sh rename to config/rootfiles/oldcore/95/update.sh diff --git a/make.sh b/make.sh index ff67537203..0a74a21aa6 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="95" # Core Level (Filename) +CORE="96" # Core Level (Filename) PAKFIRE_CORE="95" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2