Start Core Update 94
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Aug 2015 12:59:00 +0000 (13:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Aug 2015 12:59:00 +0000 (13:59 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
16 files changed:
config/rootfiles/core/94/exclude [moved from config/rootfiles/core/93/exclude with 100% similarity]
config/rootfiles/core/94/filelists/files [new file with mode: 0644]
config/rootfiles/core/94/meta [moved from config/rootfiles/core/93/meta with 100% similarity]
config/rootfiles/core/94/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/93/exclude [new file with mode: 0644]
config/rootfiles/oldcore/93/filelists/bind [moved from config/rootfiles/core/93/filelists/bind with 100% similarity]
config/rootfiles/oldcore/93/filelists/daq [moved from config/rootfiles/core/93/filelists/daq with 100% similarity]
config/rootfiles/oldcore/93/filelists/ddns [moved from config/rootfiles/core/93/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/93/filelists/dnsmasq [moved from config/rootfiles/core/93/filelists/dnsmasq with 100% similarity]
config/rootfiles/oldcore/93/filelists/files [moved from config/rootfiles/core/93/filelists/files with 100% similarity]
config/rootfiles/oldcore/93/filelists/libpcap [moved from config/rootfiles/core/93/filelists/libpcap with 100% similarity]
config/rootfiles/oldcore/93/filelists/pcre [moved from config/rootfiles/core/93/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/93/filelists/squid [moved from config/rootfiles/core/93/filelists/squid with 100% similarity]
config/rootfiles/oldcore/93/meta [new file with mode: 0644]
config/rootfiles/oldcore/93/update.sh [moved from config/rootfiles/core/93/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files
new file mode 100644 (file)
index 0000000..168c7d1
--- /dev/null
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/langs
diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/core/94/update.sh
new file mode 100644 (file)
index 0000000..e679ecf
--- /dev/null
@@ -0,0 +1,57 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /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=94
+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
+
+# 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/93/exclude b/config/rootfiles/oldcore/93/exclude
new file mode 100644 (file)
index 0000000..18e9b4d
--- /dev/null
@@ -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/oldcore/93/meta b/config/rootfiles/oldcore/93/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/make.sh b/make.sh
index 4f6eedb..1925929 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.17"                                                 # Version number
-CORE="93"                                                      # Core Level (Filename)
+CORE="94"                                                      # Core Level (Filename)
 PAKFIRE_CORE="93"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan