From: Michael Tremer Date: Thu, 22 Sep 2016 09:28:36 +0000 (+0100) Subject: Start Core Update 105 X-Git-Tag: v2.19-core105~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4a1169ed975c15ee8c29c99d0667388a09c29bf;p=ipfire-2.x.git Start Core Update 105 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/104/exclude b/config/rootfiles/core/105/exclude similarity index 100% rename from config/rootfiles/core/104/exclude rename to config/rootfiles/core/105/exclude diff --git a/config/rootfiles/core/105/filelists/files b/config/rootfiles/core/105/filelists/files new file mode 100644 index 0000000000..95f6e10005 --- /dev/null +++ b/config/rootfiles/core/105/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue \ No newline at end of file diff --git a/config/rootfiles/core/104/meta b/config/rootfiles/core/105/meta similarity index 100% rename from config/rootfiles/core/104/meta rename to config/rootfiles/core/105/meta diff --git a/config/rootfiles/core/105/update.sh b/config/rootfiles/core/105/update.sh new file mode 100644 index 0000000000..3e9f6011ba --- /dev/null +++ b/config/rootfiles/core/105/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=105 + +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 + +# 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/104/exclude b/config/rootfiles/oldcore/104/exclude new file mode 100644 index 0000000000..7ddeae0ba3 --- /dev/null +++ b/config/rootfiles/oldcore/104/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/104/filelists/acl b/config/rootfiles/oldcore/104/filelists/acl similarity index 100% rename from config/rootfiles/core/104/filelists/acl rename to config/rootfiles/oldcore/104/filelists/acl diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/104/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/104/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/104/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/104/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/104/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/104/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/104/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/104/filelists/curl b/config/rootfiles/oldcore/104/filelists/curl similarity index 100% rename from config/rootfiles/core/104/filelists/curl rename to config/rootfiles/oldcore/104/filelists/curl diff --git a/config/rootfiles/core/104/filelists/ddns b/config/rootfiles/oldcore/104/filelists/ddns similarity index 100% rename from config/rootfiles/core/104/filelists/ddns rename to config/rootfiles/oldcore/104/filelists/ddns diff --git a/config/rootfiles/core/104/filelists/dnsmasq b/config/rootfiles/oldcore/104/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/104/filelists/dnsmasq rename to config/rootfiles/oldcore/104/filelists/dnsmasq diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/oldcore/104/filelists/files similarity index 100% rename from config/rootfiles/core/104/filelists/files rename to config/rootfiles/oldcore/104/filelists/files diff --git a/config/rootfiles/core/104/filelists/i586/acpid b/config/rootfiles/oldcore/104/filelists/i586/acpid similarity index 100% rename from config/rootfiles/core/104/filelists/i586/acpid rename to config/rootfiles/oldcore/104/filelists/i586/acpid diff --git a/config/rootfiles/core/104/filelists/i586/linux b/config/rootfiles/oldcore/104/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/104/filelists/i586/linux rename to config/rootfiles/oldcore/104/filelists/i586/linux diff --git a/config/rootfiles/core/104/filelists/iputils b/config/rootfiles/oldcore/104/filelists/iputils similarity index 100% rename from config/rootfiles/core/104/filelists/iputils rename to config/rootfiles/oldcore/104/filelists/iputils diff --git a/config/rootfiles/core/104/filelists/libarchive b/config/rootfiles/oldcore/104/filelists/libarchive similarity index 100% rename from config/rootfiles/core/104/filelists/libarchive rename to config/rootfiles/oldcore/104/filelists/libarchive diff --git a/config/rootfiles/core/104/filelists/libcap b/config/rootfiles/oldcore/104/filelists/libcap similarity index 100% rename from config/rootfiles/core/104/filelists/libcap rename to config/rootfiles/oldcore/104/filelists/libcap diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/oldcore/104/filelists/ntp similarity index 100% rename from config/rootfiles/core/104/filelists/ntp rename to config/rootfiles/oldcore/104/filelists/ntp diff --git a/config/rootfiles/core/104/filelists/openssh b/config/rootfiles/oldcore/104/filelists/openssh similarity index 100% rename from config/rootfiles/core/104/filelists/openssh rename to config/rootfiles/oldcore/104/filelists/openssh diff --git a/config/rootfiles/core/104/filelists/pcre b/config/rootfiles/oldcore/104/filelists/pcre similarity index 100% rename from config/rootfiles/core/104/filelists/pcre rename to config/rootfiles/oldcore/104/filelists/pcre diff --git a/config/rootfiles/core/104/filelists/popt b/config/rootfiles/oldcore/104/filelists/popt similarity index 100% rename from config/rootfiles/core/104/filelists/popt rename to config/rootfiles/oldcore/104/filelists/popt diff --git a/config/rootfiles/core/104/filelists/screen b/config/rootfiles/oldcore/104/filelists/screen similarity index 100% rename from config/rootfiles/core/104/filelists/screen rename to config/rootfiles/oldcore/104/filelists/screen diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/oldcore/104/filelists/shadow similarity index 100% rename from config/rootfiles/core/104/filelists/shadow rename to config/rootfiles/oldcore/104/filelists/shadow diff --git a/config/rootfiles/core/104/filelists/snort b/config/rootfiles/oldcore/104/filelists/snort similarity index 100% rename from config/rootfiles/core/104/filelists/snort rename to config/rootfiles/oldcore/104/filelists/snort diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/oldcore/104/filelists/wget similarity index 100% rename from config/rootfiles/core/104/filelists/wget rename to config/rootfiles/oldcore/104/filelists/wget diff --git a/config/rootfiles/core/104/filelists/which b/config/rootfiles/oldcore/104/filelists/which similarity index 100% rename from config/rootfiles/core/104/filelists/which rename to config/rootfiles/oldcore/104/filelists/which diff --git a/config/rootfiles/core/104/filelists/x86_64/acpid b/config/rootfiles/oldcore/104/filelists/x86_64/acpid similarity index 100% rename from config/rootfiles/core/104/filelists/x86_64/acpid rename to config/rootfiles/oldcore/104/filelists/x86_64/acpid diff --git a/config/rootfiles/core/104/filelists/x86_64/linux b/config/rootfiles/oldcore/104/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/104/filelists/x86_64/linux rename to config/rootfiles/oldcore/104/filelists/x86_64/linux diff --git a/config/rootfiles/oldcore/104/meta b/config/rootfiles/oldcore/104/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/104/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/oldcore/104/update.sh similarity index 100% rename from config/rootfiles/core/104/update.sh rename to config/rootfiles/oldcore/104/update.sh