From: Arne Fitzenreiter Date: Thu, 22 Dec 2016 19:38:44 +0000 (+0100) Subject: start core109 updater X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ba5691854b06976fe130c832ce2f0ea3742ad30;p=people%2Fms%2Fipfire-2.x.git start core109 updater Signed-off-by: Arne Fitzenreiter --- diff --git a/config/rootfiles/core/108/exclude b/config/rootfiles/core/109/exclude similarity index 100% rename from config/rootfiles/core/108/exclude rename to config/rootfiles/core/109/exclude diff --git a/config/rootfiles/core/109/filelists/files b/config/rootfiles/core/109/filelists/files new file mode 100644 index 0000000000..ca49b1b5e4 --- /dev/null +++ b/config/rootfiles/core/109/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +usr/local/bin/syslogdctrl diff --git a/config/rootfiles/core/109/filelists/snort b/config/rootfiles/core/109/filelists/snort new file mode 120000 index 0000000000..9406ce01c7 --- /dev/null +++ b/config/rootfiles/core/109/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/108/filelists/squid b/config/rootfiles/core/109/filelists/squid similarity index 100% rename from config/rootfiles/core/108/filelists/squid rename to config/rootfiles/core/109/filelists/squid diff --git a/config/rootfiles/core/109/filelists/unbound b/config/rootfiles/core/109/filelists/unbound new file mode 120000 index 0000000000..66adf09242 --- /dev/null +++ b/config/rootfiles/core/109/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file diff --git a/config/rootfiles/core/108/meta b/config/rootfiles/core/109/meta similarity index 100% rename from config/rootfiles/core/108/meta rename to config/rootfiles/core/109/meta diff --git a/config/rootfiles/core/109/update.sh b/config/rootfiles/core/109/update.sh new file mode 100644 index 0000000000..c601654aed --- /dev/null +++ b/config/rootfiles/core/109/update.sh @@ -0,0 +1,69 @@ +#!/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=109 + +# 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 +/etc/init.d/squid stop +/etc/init.d/snort stop +/etc/init.d/unbound stop + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services +/etc/init.d/unbound start +/etc/init.d/squid start +/etc/init.d/snort 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/108/exclude b/config/rootfiles/oldcore/108/exclude new file mode 100644 index 0000000000..7ddeae0ba3 --- /dev/null +++ b/config/rootfiles/oldcore/108/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/108/filelists/ddns b/config/rootfiles/oldcore/108/filelists/ddns similarity index 100% rename from config/rootfiles/core/108/filelists/ddns rename to config/rootfiles/oldcore/108/filelists/ddns diff --git a/config/rootfiles/core/108/filelists/files b/config/rootfiles/oldcore/108/filelists/files similarity index 100% rename from config/rootfiles/core/108/filelists/files rename to config/rootfiles/oldcore/108/filelists/files diff --git a/config/rootfiles/core/108/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/108/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/108/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/108/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/108/filelists/ntp b/config/rootfiles/oldcore/108/filelists/ntp similarity index 100% rename from config/rootfiles/core/108/filelists/ntp rename to config/rootfiles/oldcore/108/filelists/ntp diff --git a/config/rootfiles/oldcore/108/filelists/squid b/config/rootfiles/oldcore/108/filelists/squid new file mode 120000 index 0000000000..2dc8372a0e --- /dev/null +++ b/config/rootfiles/oldcore/108/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/108/filelists/strongswan b/config/rootfiles/oldcore/108/filelists/strongswan similarity index 100% rename from config/rootfiles/core/108/filelists/strongswan rename to config/rootfiles/oldcore/108/filelists/strongswan diff --git a/config/rootfiles/oldcore/108/meta b/config/rootfiles/oldcore/108/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/108/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/108/update.sh b/config/rootfiles/oldcore/108/update.sh similarity index 100% rename from config/rootfiles/core/108/update.sh rename to config/rootfiles/oldcore/108/update.sh diff --git a/make.sh b/make.sh index 390c719e33..a2ff7f052f 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="108" # Core Level (Filename) +CORE="109" # Core Level (Filename) PAKFIRE_CORE="108" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan