core103: start

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/102/exclude b/config/rootfiles/core/103/exclude
similarity index 100%
rename from config/rootfiles/core/102/exclude
rename to config/rootfiles/core/103/exclude

diff --git a/config/rootfiles/core/102/filelists/files b/config/rootfiles/core/103/filelists/files
similarity index 100%
rename from config/rootfiles/core/102/filelists/files
rename to config/rootfiles/core/103/filelists/files

diff --git a/config/rootfiles/core/102/meta b/config/rootfiles/core/103/meta
similarity index 100%
rename from config/rootfiles/core/102/meta
rename to config/rootfiles/core/103/meta

diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh
new file mode 100644 (file)
index 0000000..924cab3
--- /dev/null
+++ b/config/rootfiles/core/103/update.sh
@@ -0,0 +1,74 @@
+#!/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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=103
+
+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
+#
+
+sync
+# 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/102/exclude b/config/rootfiles/oldcore/102/exclude
new file mode 100644 (file)
index 0000000..7ddeae0
--- /dev/null
+++ b/config/rootfiles/oldcore/102/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/oldcore/102/filelists/files b/config/rootfiles/oldcore/102/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
+++ b/config/rootfiles/oldcore/102/filelists/files
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

diff --git a/config/rootfiles/core/102/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/102/filelists/i586/openssl-sse2
similarity index 100%
rename from config/rootfiles/core/102/filelists/i586/openssl-sse2
rename to config/rootfiles/oldcore/102/filelists/i586/openssl-sse2

diff --git a/config/rootfiles/core/102/filelists/openssh b/config/rootfiles/oldcore/102/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/102/filelists/openssh
rename to config/rootfiles/oldcore/102/filelists/openssh

diff --git a/config/rootfiles/core/102/filelists/openssl b/config/rootfiles/oldcore/102/filelists/openssl
similarity index 100%
rename from config/rootfiles/core/102/filelists/openssl
rename to config/rootfiles/oldcore/102/filelists/openssl

diff --git a/config/rootfiles/oldcore/102/meta b/config/rootfiles/oldcore/102/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/102/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/102/update.sh b/config/rootfiles/oldcore/102/update.sh
similarity index 100%
rename from config/rootfiles/core/102/update.sh
rename to config/rootfiles/oldcore/102/update.sh

diff --git a/make.sh b/make.sh
index bdf58b9e06382b569ff8b654c696533cb14f3e96..fee4edd824721e41b9454ea83b9d789e6f987057 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="102"                                                     # Core Level (Filename)
+CORE="103"                                                     # Core Level (Filename)
 PAKFIRE_CORE="102"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan