]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
core101: start update.
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Apr 2016 17:57:46 +0000 (19:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 6 Apr 2016 17:57:46 +0000 (19:57 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
56 files changed:
config/rootfiles/core/101/exclude [moved from config/rootfiles/core/100/exclude with 100% similarity]
config/rootfiles/core/101/filelists/files [new file with mode: 0644]
config/rootfiles/core/101/filelists/i586/dmidecode [new symlink]
config/rootfiles/core/101/filelists/pcre [new symlink]
config/rootfiles/core/101/filelists/squid [moved from config/rootfiles/core/100/filelists/squid with 100% similarity]
config/rootfiles/core/101/filelists/x86_64/dmidecode [new symlink]
config/rootfiles/core/101/meta [moved from config/rootfiles/core/100/meta with 100% similarity]
config/rootfiles/core/101/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/100/exclude [new file with mode: 0644]
config/rootfiles/oldcore/100/filelists/armv5tel/binutils [moved from config/rootfiles/core/100/filelists/armv5tel/binutils with 100% similarity]
config/rootfiles/oldcore/100/filelists/armv5tel/gcc [moved from config/rootfiles/core/100/filelists/armv5tel/gcc with 100% similarity]
config/rootfiles/oldcore/100/filelists/armv5tel/glibc [moved from config/rootfiles/core/100/filelists/armv5tel/glibc with 100% similarity]
config/rootfiles/oldcore/100/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/100/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/100/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/100/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/100/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/100/filelists/ath10k-firmware [moved from config/rootfiles/core/100/filelists/ath10k-firmware with 100% similarity]
config/rootfiles/oldcore/100/filelists/bind [moved from config/rootfiles/core/100/filelists/bind with 100% similarity]
config/rootfiles/oldcore/100/filelists/diffutils [moved from config/rootfiles/core/100/filelists/diffutils with 100% similarity]
config/rootfiles/oldcore/100/filelists/dnsmasq [moved from config/rootfiles/core/100/filelists/dnsmasq with 100% similarity]
config/rootfiles/oldcore/100/filelists/files [moved from config/rootfiles/core/100/filelists/files with 100% similarity]
config/rootfiles/oldcore/100/filelists/grep [moved from config/rootfiles/core/100/filelists/grep with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/binutils [moved from config/rootfiles/core/100/filelists/i586/binutils with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/gcc [moved from config/rootfiles/core/100/filelists/i586/gcc with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/glibc [moved from config/rootfiles/core/100/filelists/i586/glibc with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/grub [moved from config/rootfiles/core/100/filelists/i586/grub with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/linux [moved from config/rootfiles/core/100/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/linux-initrd [moved from config/rootfiles/core/100/filelists/i586/linux-initrd with 100% similarity]
config/rootfiles/oldcore/100/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/100/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/100/filelists/libmpc [moved from config/rootfiles/core/100/filelists/libmpc with 100% similarity]
config/rootfiles/oldcore/100/filelists/lua [moved from config/rootfiles/core/100/filelists/lua with 100% similarity]
config/rootfiles/oldcore/100/filelists/mt7601u-firmware [moved from config/rootfiles/core/100/filelists/mt7601u-firmware with 100% similarity]
config/rootfiles/oldcore/100/filelists/ncurses [moved from config/rootfiles/core/100/filelists/ncurses with 100% similarity]
config/rootfiles/oldcore/100/filelists/ntp [moved from config/rootfiles/core/100/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/100/filelists/openssh [moved from config/rootfiles/core/100/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/100/filelists/openssl [moved from config/rootfiles/core/100/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/100/filelists/openvpn [moved from config/rootfiles/core/100/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/100/filelists/sed [moved from config/rootfiles/core/100/filelists/sed with 100% similarity]
config/rootfiles/oldcore/100/filelists/squid [new symlink]
config/rootfiles/oldcore/100/filelists/tzdata [moved from config/rootfiles/core/100/filelists/tzdata with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/binutils [moved from config/rootfiles/core/100/filelists/x86_64/binutils with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/gcc [moved from config/rootfiles/core/100/filelists/x86_64/gcc with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/glibc [moved from config/rootfiles/core/100/filelists/x86_64/glibc with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/grub [moved from config/rootfiles/core/100/filelists/x86_64/grub with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/linux [moved from config/rootfiles/core/100/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/100/filelists/x86_64/linux-initrd [moved from config/rootfiles/core/100/filelists/x86_64/linux-initrd with 100% similarity]
config/rootfiles/oldcore/100/filelists/xz [moved from config/rootfiles/core/100/filelists/xz with 100% similarity]
config/rootfiles/oldcore/100/meta [moved from config/rootfiles/core/99/meta with 100% similarity]
config/rootfiles/oldcore/100/update.sh [moved from config/rootfiles/core/100/update.sh with 100% similarity]
config/rootfiles/oldcore/99/exclude [moved from config/rootfiles/core/99/exclude with 100% similarity]
config/rootfiles/oldcore/99/filelists/files [moved from config/rootfiles/core/99/filelists/files with 100% similarity]
config/rootfiles/oldcore/99/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/99/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/99/filelists/openssh [moved from config/rootfiles/core/99/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/99/filelists/openssl [moved from config/rootfiles/core/99/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/99/meta [new file with mode: 0644]
config/rootfiles/oldcore/99/update.sh [moved from config/rootfiles/core/99/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/101/filelists/files b/config/rootfiles/core/101/filelists/files
new file mode 100644 (file)
index 0000000..409e5fe
--- /dev/null
@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue
diff --git a/config/rootfiles/core/101/filelists/i586/dmidecode b/config/rootfiles/core/101/filelists/i586/dmidecode
new file mode 120000 (symlink)
index 0000000..1add99b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/dmidecode
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/pcre b/config/rootfiles/core/101/filelists/pcre
new file mode 120000 (symlink)
index 0000000..b390d9a
--- /dev/null
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/101/filelists/x86_64/dmidecode b/config/rootfiles/core/101/filelists/x86_64/dmidecode
new file mode 120000 (symlink)
index 0000000..88f5f0a
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/dmidecode
\ No newline at end of file
diff --git a/config/rootfiles/core/101/update.sh b/config/rootfiles/core/101/update.sh
new file mode 100644 (file)
index 0000000..f448474
--- /dev/null
@@ -0,0 +1,76 @@
+#!/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=101
+
+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
+/etc/init.d/squid stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+#
+# Start services
+#
+/etc/init.d/squid start
+
+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/100/exclude b/config/rootfiles/oldcore/100/exclude
new file mode 100644 (file)
index 0000000..8e446ce
--- /dev/null
@@ -0,0 +1,26 @@
+boot/config.txt
+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/100/filelists/squid b/config/rootfiles/oldcore/100/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/99/meta b/config/rootfiles/oldcore/99/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/make.sh b/make.sh
index d954b62d540533d72e4c6df8a704b925e35920ff..22ff82072305bf5748e32a1d37aded3010923b9b 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="100"                                                     # Core Level (Filename)
+CORE="101"                                                     # Core Level (Filename)
 PAKFIRE_CORE="100"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan