From c172d453c1e7962d0b1741640b0c030d21fab449 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 3 Nov 2014 23:41:09 +0100 Subject: [PATCH] Create Core Update 86 --- config/rootfiles/core/86/exclude | 20 +++++ .../core/86/filelists/armv5tel/initscripts | 1 + .../core/86/filelists/armv5tel/linux-kirkwood | 1 + .../core/86/filelists/armv5tel/linux-multi | 1 + .../core/86/filelists/armv5tel/linux-rpi | 1 + config/rootfiles/core/86/filelists/coreutils | 1 + config/rootfiles/core/86/filelists/dracut | 1 + config/rootfiles/core/86/filelists/files | 5 ++ config/rootfiles/core/86/filelists/i586/glibc | 1 + config/rootfiles/core/86/filelists/i586/grub | 1 + .../core/86/filelists/i586/initscripts | 1 + config/rootfiles/core/86/filelists/i586/linux | 1 + .../core/86/filelists/i586/linux-initrd | 1 + config/rootfiles/core/86/filelists/libcap | 1 + config/rootfiles/core/86/filelists/libsmooth | 1 + config/rootfiles/core/86/filelists/lvm2 | 1 + config/rootfiles/core/86/filelists/mdadm | 1 + config/rootfiles/core/86/filelists/misc-progs | 1 + .../core/86/filelists/multipath-tools | 1 + config/rootfiles/core/86/filelists/newt | 1 + config/rootfiles/core/86/filelists/parted | 1 + config/rootfiles/core/86/filelists/patch | 1 + config/rootfiles/core/86/filelists/pigz | 1 + config/rootfiles/core/86/filelists/setup | 1 + config/rootfiles/core/86/filelists/slang | 1 + config/rootfiles/core/86/filelists/strongswan | 1 + config/rootfiles/core/86/filelists/tzdata | 1 + config/rootfiles/core/86/filelists/xfsprogs | 1 + config/rootfiles/core/86/meta | 1 + config/rootfiles/core/86/update.sh | 77 +++++++++++++++++++ 30 files changed, 129 insertions(+) create mode 100644 config/rootfiles/core/86/exclude create mode 120000 config/rootfiles/core/86/filelists/armv5tel/initscripts create mode 120000 config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood create mode 120000 config/rootfiles/core/86/filelists/armv5tel/linux-multi create mode 120000 config/rootfiles/core/86/filelists/armv5tel/linux-rpi create mode 120000 config/rootfiles/core/86/filelists/coreutils create mode 120000 config/rootfiles/core/86/filelists/dracut create mode 100644 config/rootfiles/core/86/filelists/files create mode 120000 config/rootfiles/core/86/filelists/i586/glibc create mode 120000 config/rootfiles/core/86/filelists/i586/grub create mode 120000 config/rootfiles/core/86/filelists/i586/initscripts create mode 120000 config/rootfiles/core/86/filelists/i586/linux create mode 120000 config/rootfiles/core/86/filelists/i586/linux-initrd create mode 120000 config/rootfiles/core/86/filelists/libcap create mode 120000 config/rootfiles/core/86/filelists/libsmooth create mode 120000 config/rootfiles/core/86/filelists/lvm2 create mode 120000 config/rootfiles/core/86/filelists/mdadm create mode 120000 config/rootfiles/core/86/filelists/misc-progs create mode 120000 config/rootfiles/core/86/filelists/multipath-tools create mode 120000 config/rootfiles/core/86/filelists/newt create mode 120000 config/rootfiles/core/86/filelists/parted create mode 120000 config/rootfiles/core/86/filelists/patch create mode 120000 config/rootfiles/core/86/filelists/pigz create mode 120000 config/rootfiles/core/86/filelists/setup create mode 120000 config/rootfiles/core/86/filelists/slang create mode 120000 config/rootfiles/core/86/filelists/strongswan create mode 120000 config/rootfiles/core/86/filelists/tzdata create mode 120000 config/rootfiles/core/86/filelists/xfsprogs create mode 100644 config/rootfiles/core/86/meta create mode 100644 config/rootfiles/core/86/update.sh diff --git a/config/rootfiles/core/86/exclude b/config/rootfiles/core/86/exclude new file mode 100644 index 0000000000..18e9b4d243 --- /dev/null +++ b/config/rootfiles/core/86/exclude @@ -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/core/86/filelists/armv5tel/initscripts b/config/rootfiles/core/86/filelists/armv5tel/initscripts new file mode 120000 index 0000000000..af1d762cee --- /dev/null +++ b/config/rootfiles/core/86/filelists/armv5tel/initscripts @@ -0,0 +1 @@ +../../../../common/armv5tel/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000000..72171071e6 --- /dev/null +++ b/config/rootfiles/core/86/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-multi b/config/rootfiles/core/86/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/core/86/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/armv5tel/linux-rpi b/config/rootfiles/core/86/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000000..a651a498fe --- /dev/null +++ b/config/rootfiles/core/86/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/coreutils b/config/rootfiles/core/86/filelists/coreutils new file mode 120000 index 0000000000..7351ed2cf5 --- /dev/null +++ b/config/rootfiles/core/86/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/dracut b/config/rootfiles/core/86/filelists/dracut new file mode 120000 index 0000000000..160869946d --- /dev/null +++ b/config/rootfiles/core/86/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files new file mode 100644 index 0000000000..cfcb0cce1e --- /dev/null +++ b/config/rootfiles/core/86/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/lang.pl diff --git a/config/rootfiles/core/86/filelists/i586/glibc b/config/rootfiles/core/86/filelists/i586/glibc new file mode 120000 index 0000000000..943021f19a --- /dev/null +++ b/config/rootfiles/core/86/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/grub b/config/rootfiles/core/86/filelists/i586/grub new file mode 120000 index 0000000000..feb236a224 --- /dev/null +++ b/config/rootfiles/core/86/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/initscripts b/config/rootfiles/core/86/filelists/i586/initscripts new file mode 120000 index 0000000000..12d8770605 --- /dev/null +++ b/config/rootfiles/core/86/filelists/i586/initscripts @@ -0,0 +1 @@ +../../../../common/i586/initscripts \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/linux b/config/rootfiles/core/86/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/86/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/i586/linux-initrd b/config/rootfiles/core/86/filelists/i586/linux-initrd new file mode 120000 index 0000000000..32a03e6a90 --- /dev/null +++ b/config/rootfiles/core/86/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/libcap b/config/rootfiles/core/86/filelists/libcap new file mode 120000 index 0000000000..ed67d950a8 --- /dev/null +++ b/config/rootfiles/core/86/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/libsmooth b/config/rootfiles/core/86/filelists/libsmooth new file mode 120000 index 0000000000..6164182967 --- /dev/null +++ b/config/rootfiles/core/86/filelists/libsmooth @@ -0,0 +1 @@ +../../../common/libsmooth \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/lvm2 b/config/rootfiles/core/86/filelists/lvm2 new file mode 120000 index 0000000000..d640870b75 --- /dev/null +++ b/config/rootfiles/core/86/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/mdadm b/config/rootfiles/core/86/filelists/mdadm new file mode 120000 index 0000000000..465808b209 --- /dev/null +++ b/config/rootfiles/core/86/filelists/mdadm @@ -0,0 +1 @@ +../../../common/mdadm \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/misc-progs b/config/rootfiles/core/86/filelists/misc-progs new file mode 120000 index 0000000000..7223cadddd --- /dev/null +++ b/config/rootfiles/core/86/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/multipath-tools b/config/rootfiles/core/86/filelists/multipath-tools new file mode 120000 index 0000000000..9ff63237c5 --- /dev/null +++ b/config/rootfiles/core/86/filelists/multipath-tools @@ -0,0 +1 @@ +../../../common/multipath-tools \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/newt b/config/rootfiles/core/86/filelists/newt new file mode 120000 index 0000000000..fb3eb20c3e --- /dev/null +++ b/config/rootfiles/core/86/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/parted b/config/rootfiles/core/86/filelists/parted new file mode 120000 index 0000000000..89195d8e89 --- /dev/null +++ b/config/rootfiles/core/86/filelists/parted @@ -0,0 +1 @@ +../../../common/parted \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/patch b/config/rootfiles/core/86/filelists/patch new file mode 120000 index 0000000000..27a38252a9 --- /dev/null +++ b/config/rootfiles/core/86/filelists/patch @@ -0,0 +1 @@ +../../../common/patch \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/pigz b/config/rootfiles/core/86/filelists/pigz new file mode 120000 index 0000000000..696f8f8702 --- /dev/null +++ b/config/rootfiles/core/86/filelists/pigz @@ -0,0 +1 @@ +../../../common/pigz \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/setup b/config/rootfiles/core/86/filelists/setup new file mode 120000 index 0000000000..209374bbcf --- /dev/null +++ b/config/rootfiles/core/86/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/slang b/config/rootfiles/core/86/filelists/slang new file mode 120000 index 0000000000..228e45ed4c --- /dev/null +++ b/config/rootfiles/core/86/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/strongswan b/config/rootfiles/core/86/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/86/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/tzdata b/config/rootfiles/core/86/filelists/tzdata new file mode 120000 index 0000000000..5a6e3252f3 --- /dev/null +++ b/config/rootfiles/core/86/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/86/filelists/xfsprogs b/config/rootfiles/core/86/filelists/xfsprogs new file mode 120000 index 0000000000..91032964d5 --- /dev/null +++ b/config/rootfiles/core/86/filelists/xfsprogs @@ -0,0 +1 @@ +../../../common/xfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/86/meta b/config/rootfiles/core/86/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/86/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/update.sh new file mode 100644 index 0000000000..7911a11f5f --- /dev/null +++ b/config/rootfiles/core/86/update.sh @@ -0,0 +1,77 @@ +#!/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) 2014 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Find root device +function find_root_device() { + while read -r dev mountpoint fs options; do + # Skip generic entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mountpoint}" = "/" ]; then + echo "${mountpoint}" + break + fi + done < /proc/mounts +} + +# Remove old core updates from pakfire cache to save space... +core=86 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Upgrade to GRUB2 +root_device="$(find_root_device)" +if ! grub-install "${root_device}"; then + if ! grub-install --force "${root_device}"; then + echo "Could not update the bootloader!" + fi +fi + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 -- 2.39.2