From 38183e52dd438dbe0bb204d4601e902fb6cf0af5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 27 Oct 2016 21:06:16 +0200 Subject: [PATCH] start core107 updater Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/107/exclude | 29 ++ .../107/filelists/armv5tel/linux-kirkwood | 1 + .../core/107/filelists/armv5tel/linux-multi | 1 + .../core/107/filelists/armv5tel/linux-rpi | 1 + config/rootfiles/core/107/filelists/files | 5 + config/rootfiles/core/107/filelists/hdparm | 1 + .../rootfiles/core/107/filelists/i586/linux | 1 + config/rootfiles/core/107/filelists/libjpeg | 1 + .../core/107/filelists/libjpeg-compat | 1 + .../core/{106 => 107}/filelists/squid | 0 .../rootfiles/core/107/filelists/x86_64/linux | 1 + config/rootfiles/core/{106 => 107}/meta | 0 config/rootfiles/core/107/update.sh | 249 ++++++++++++++++++ .../rootfiles/{core => oldcore}/106/exclude | 0 .../{core => oldcore}/106/filelists/attr | 0 .../{core => oldcore}/106/filelists/diffutils | 0 .../{core => oldcore}/106/filelists/ed | 0 .../{core => oldcore}/106/filelists/expat | 0 .../{core => oldcore}/106/filelists/file | 0 .../{core => oldcore}/106/filelists/files | 0 .../{core => oldcore}/106/filelists/flex | 0 .../{core => oldcore}/106/filelists/gawk | 0 .../{core => oldcore}/106/filelists/gettext | 0 .../{core => oldcore}/106/filelists/gnupg | 0 .../106/filelists/i586/openssl-sse2 | 0 .../106/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/106/filelists/iproute2 | 0 .../{core => oldcore}/106/filelists/ipset | 0 .../106/filelists/libgpg-error | 0 .../{core => oldcore}/106/filelists/libidn | 0 .../{core => oldcore}/106/filelists/libmnl | 0 .../106/filelists/libnetfilter_conntrack | 0 .../106/filelists/misc-progs | 0 .../106/filelists/mt7601u-firmware | 0 .../{core => oldcore}/106/filelists/openssl | 0 .../106/filelists/python-daemon | 0 .../106/filelists/python-docutils | 0 .../106/filelists/python-inotify | 0 .../106/filelists/python-ipaddress | 0 .../106/filelists/smartmontools | 0 config/rootfiles/oldcore/106/filelists/squid | 1 + .../106/filelists/strongswan | 0 .../{core => oldcore}/106/filelists/unbound | 0 .../106/filelists/usb_modeswitch | 0 .../106/filelists/usb_modeswitch_data | 0 config/rootfiles/oldcore/106/meta | 1 + .../rootfiles/{core => oldcore}/106/update.sh | 0 make.sh | 2 +- 48 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 config/rootfiles/core/107/exclude create mode 120000 config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood create mode 120000 config/rootfiles/core/107/filelists/armv5tel/linux-multi create mode 120000 config/rootfiles/core/107/filelists/armv5tel/linux-rpi create mode 100644 config/rootfiles/core/107/filelists/files create mode 120000 config/rootfiles/core/107/filelists/hdparm create mode 120000 config/rootfiles/core/107/filelists/i586/linux create mode 120000 config/rootfiles/core/107/filelists/libjpeg create mode 120000 config/rootfiles/core/107/filelists/libjpeg-compat rename config/rootfiles/core/{106 => 107}/filelists/squid (100%) create mode 120000 config/rootfiles/core/107/filelists/x86_64/linux rename config/rootfiles/core/{106 => 107}/meta (100%) create mode 100644 config/rootfiles/core/107/update.sh rename config/rootfiles/{core => oldcore}/106/exclude (100%) rename config/rootfiles/{core => oldcore}/106/filelists/attr (100%) rename config/rootfiles/{core => oldcore}/106/filelists/diffutils (100%) rename config/rootfiles/{core => oldcore}/106/filelists/ed (100%) rename config/rootfiles/{core => oldcore}/106/filelists/expat (100%) rename config/rootfiles/{core => oldcore}/106/filelists/file (100%) rename config/rootfiles/{core => oldcore}/106/filelists/files (100%) rename config/rootfiles/{core => oldcore}/106/filelists/flex (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gawk (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gettext (100%) rename config/rootfiles/{core => oldcore}/106/filelists/gnupg (100%) rename config/rootfiles/{core => oldcore}/106/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/106/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/106/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/106/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libidn (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libmnl (100%) rename config/rootfiles/{core => oldcore}/106/filelists/libnetfilter_conntrack (100%) rename config/rootfiles/{core => oldcore}/106/filelists/misc-progs (100%) rename config/rootfiles/{core => oldcore}/106/filelists/mt7601u-firmware (100%) rename config/rootfiles/{core => oldcore}/106/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-daemon (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-docutils (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-inotify (100%) rename config/rootfiles/{core => oldcore}/106/filelists/python-ipaddress (100%) rename config/rootfiles/{core => oldcore}/106/filelists/smartmontools (100%) create mode 120000 config/rootfiles/oldcore/106/filelists/squid rename config/rootfiles/{core => oldcore}/106/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/106/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/106/filelists/usb_modeswitch_data (100%) create mode 100644 config/rootfiles/oldcore/106/meta rename config/rootfiles/{core => oldcore}/106/update.sh (100%) diff --git a/config/rootfiles/core/107/exclude b/config/rootfiles/core/107/exclude new file mode 100644 index 0000000000..1d8d74e219 --- /dev/null +++ b/config/rootfiles/core/107/exclude @@ -0,0 +1,29 @@ +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/lib/unbound/root.key +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000000..72171071e6 --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-multi b/config/rootfiles/core/107/filelists/armv5tel/linux-multi new file mode 120000 index 0000000000..204eb4c437 --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-rpi b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000000..a651a498fe --- /dev/null +++ b/config/rootfiles/core/107/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/files b/config/rootfiles/core/107/filelists/files new file mode 100644 index 0000000000..b03a86ed77 --- /dev/null +++ b/config/rootfiles/core/107/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/traffic.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/107/filelists/hdparm b/config/rootfiles/core/107/filelists/hdparm new file mode 120000 index 0000000000..b6447518ad --- /dev/null +++ b/config/rootfiles/core/107/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/i586/linux b/config/rootfiles/core/107/filelists/i586/linux new file mode 120000 index 0000000000..693ec4bbf9 --- /dev/null +++ b/config/rootfiles/core/107/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/libjpeg b/config/rootfiles/core/107/filelists/libjpeg new file mode 120000 index 0000000000..3b1a782fb1 --- /dev/null +++ b/config/rootfiles/core/107/filelists/libjpeg @@ -0,0 +1 @@ +../../../common/libjpeg \ No newline at end of file diff --git a/config/rootfiles/core/107/filelists/libjpeg-compat b/config/rootfiles/core/107/filelists/libjpeg-compat new file mode 120000 index 0000000000..e6ff86d21c --- /dev/null +++ b/config/rootfiles/core/107/filelists/libjpeg-compat @@ -0,0 +1 @@ +../../../common/libjpeg-compat \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/squid b/config/rootfiles/core/107/filelists/squid similarity index 100% rename from config/rootfiles/core/106/filelists/squid rename to config/rootfiles/core/107/filelists/squid diff --git a/config/rootfiles/core/107/filelists/x86_64/linux b/config/rootfiles/core/107/filelists/x86_64/linux new file mode 120000 index 0000000000..0615b5b9ad --- /dev/null +++ b/config/rootfiles/core/107/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/106/meta b/config/rootfiles/core/107/meta similarity index 100% rename from config/rootfiles/core/106/meta rename to config/rootfiles/core/107/meta diff --git a/config/rootfiles/core/107/update.sh b/config/rootfiles/core/107/update.sh new file mode 100644 index 0000000000..b8987b05c3 --- /dev/null +++ b/config/rootfiles/core/107/update.sh @@ -0,0 +1,249 @@ +#!/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 + +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + +core=107 + +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 + +# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/zImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi + touch /boot/uImage-ipfire-kirkwood + touch /boot/zImage-ipfire-multi + touch /boot/uIinit-ipfire-kirkwood + touch /boot/uIinit-ipfire-multi + ;; +esac + +# Stop services +/etc/init.d/collectd stop +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/apache stop + +# Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Remove some old files + +# update linker config +ldconfig + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# Update Language cache +/usr/local/bin/update-lang-cache + +# +# Start services +# +/etc/init.d/collectd start +/etc/init.d/apache start +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# Delete old QoS enabled indicator +rm -f /var/ipfire/qos/enable + +# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +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/core/106/exclude b/config/rootfiles/oldcore/106/exclude similarity index 100% rename from config/rootfiles/core/106/exclude rename to config/rootfiles/oldcore/106/exclude diff --git a/config/rootfiles/core/106/filelists/attr b/config/rootfiles/oldcore/106/filelists/attr similarity index 100% rename from config/rootfiles/core/106/filelists/attr rename to config/rootfiles/oldcore/106/filelists/attr diff --git a/config/rootfiles/core/106/filelists/diffutils b/config/rootfiles/oldcore/106/filelists/diffutils similarity index 100% rename from config/rootfiles/core/106/filelists/diffutils rename to config/rootfiles/oldcore/106/filelists/diffutils diff --git a/config/rootfiles/core/106/filelists/ed b/config/rootfiles/oldcore/106/filelists/ed similarity index 100% rename from config/rootfiles/core/106/filelists/ed rename to config/rootfiles/oldcore/106/filelists/ed diff --git a/config/rootfiles/core/106/filelists/expat b/config/rootfiles/oldcore/106/filelists/expat similarity index 100% rename from config/rootfiles/core/106/filelists/expat rename to config/rootfiles/oldcore/106/filelists/expat diff --git a/config/rootfiles/core/106/filelists/file b/config/rootfiles/oldcore/106/filelists/file similarity index 100% rename from config/rootfiles/core/106/filelists/file rename to config/rootfiles/oldcore/106/filelists/file diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/oldcore/106/filelists/files similarity index 100% rename from config/rootfiles/core/106/filelists/files rename to config/rootfiles/oldcore/106/filelists/files diff --git a/config/rootfiles/core/106/filelists/flex b/config/rootfiles/oldcore/106/filelists/flex similarity index 100% rename from config/rootfiles/core/106/filelists/flex rename to config/rootfiles/oldcore/106/filelists/flex diff --git a/config/rootfiles/core/106/filelists/gawk b/config/rootfiles/oldcore/106/filelists/gawk similarity index 100% rename from config/rootfiles/core/106/filelists/gawk rename to config/rootfiles/oldcore/106/filelists/gawk diff --git a/config/rootfiles/core/106/filelists/gettext b/config/rootfiles/oldcore/106/filelists/gettext similarity index 100% rename from config/rootfiles/core/106/filelists/gettext rename to config/rootfiles/oldcore/106/filelists/gettext diff --git a/config/rootfiles/core/106/filelists/gnupg b/config/rootfiles/oldcore/106/filelists/gnupg similarity index 100% rename from config/rootfiles/core/106/filelists/gnupg rename to config/rootfiles/oldcore/106/filelists/gnupg diff --git a/config/rootfiles/core/106/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/106/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/106/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/106/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/106/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/106/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/106/filelists/iproute2 b/config/rootfiles/oldcore/106/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/106/filelists/iproute2 rename to config/rootfiles/oldcore/106/filelists/iproute2 diff --git a/config/rootfiles/core/106/filelists/ipset b/config/rootfiles/oldcore/106/filelists/ipset similarity index 100% rename from config/rootfiles/core/106/filelists/ipset rename to config/rootfiles/oldcore/106/filelists/ipset diff --git a/config/rootfiles/core/106/filelists/libgpg-error b/config/rootfiles/oldcore/106/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/106/filelists/libgpg-error rename to config/rootfiles/oldcore/106/filelists/libgpg-error diff --git a/config/rootfiles/core/106/filelists/libidn b/config/rootfiles/oldcore/106/filelists/libidn similarity index 100% rename from config/rootfiles/core/106/filelists/libidn rename to config/rootfiles/oldcore/106/filelists/libidn diff --git a/config/rootfiles/core/106/filelists/libmnl b/config/rootfiles/oldcore/106/filelists/libmnl similarity index 100% rename from config/rootfiles/core/106/filelists/libmnl rename to config/rootfiles/oldcore/106/filelists/libmnl diff --git a/config/rootfiles/core/106/filelists/libnetfilter_conntrack b/config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack similarity index 100% rename from config/rootfiles/core/106/filelists/libnetfilter_conntrack rename to config/rootfiles/oldcore/106/filelists/libnetfilter_conntrack diff --git a/config/rootfiles/core/106/filelists/misc-progs b/config/rootfiles/oldcore/106/filelists/misc-progs similarity index 100% rename from config/rootfiles/core/106/filelists/misc-progs rename to config/rootfiles/oldcore/106/filelists/misc-progs diff --git a/config/rootfiles/core/106/filelists/mt7601u-firmware b/config/rootfiles/oldcore/106/filelists/mt7601u-firmware similarity index 100% rename from config/rootfiles/core/106/filelists/mt7601u-firmware rename to config/rootfiles/oldcore/106/filelists/mt7601u-firmware diff --git a/config/rootfiles/core/106/filelists/openssl b/config/rootfiles/oldcore/106/filelists/openssl similarity index 100% rename from config/rootfiles/core/106/filelists/openssl rename to config/rootfiles/oldcore/106/filelists/openssl diff --git a/config/rootfiles/core/106/filelists/python-daemon b/config/rootfiles/oldcore/106/filelists/python-daemon similarity index 100% rename from config/rootfiles/core/106/filelists/python-daemon rename to config/rootfiles/oldcore/106/filelists/python-daemon diff --git a/config/rootfiles/core/106/filelists/python-docutils b/config/rootfiles/oldcore/106/filelists/python-docutils similarity index 100% rename from config/rootfiles/core/106/filelists/python-docutils rename to config/rootfiles/oldcore/106/filelists/python-docutils diff --git a/config/rootfiles/core/106/filelists/python-inotify b/config/rootfiles/oldcore/106/filelists/python-inotify similarity index 100% rename from config/rootfiles/core/106/filelists/python-inotify rename to config/rootfiles/oldcore/106/filelists/python-inotify diff --git a/config/rootfiles/core/106/filelists/python-ipaddress b/config/rootfiles/oldcore/106/filelists/python-ipaddress similarity index 100% rename from config/rootfiles/core/106/filelists/python-ipaddress rename to config/rootfiles/oldcore/106/filelists/python-ipaddress diff --git a/config/rootfiles/core/106/filelists/smartmontools b/config/rootfiles/oldcore/106/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/106/filelists/smartmontools rename to config/rootfiles/oldcore/106/filelists/smartmontools diff --git a/config/rootfiles/oldcore/106/filelists/squid b/config/rootfiles/oldcore/106/filelists/squid new file mode 120000 index 0000000000..2dc8372a0e --- /dev/null +++ b/config/rootfiles/oldcore/106/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/106/filelists/strongswan b/config/rootfiles/oldcore/106/filelists/strongswan similarity index 100% rename from config/rootfiles/core/106/filelists/strongswan rename to config/rootfiles/oldcore/106/filelists/strongswan diff --git a/config/rootfiles/core/106/filelists/unbound b/config/rootfiles/oldcore/106/filelists/unbound similarity index 100% rename from config/rootfiles/core/106/filelists/unbound rename to config/rootfiles/oldcore/106/filelists/unbound diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch b/config/rootfiles/oldcore/106/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/106/filelists/usb_modeswitch rename to config/rootfiles/oldcore/106/filelists/usb_modeswitch diff --git a/config/rootfiles/core/106/filelists/usb_modeswitch_data b/config/rootfiles/oldcore/106/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/106/filelists/usb_modeswitch_data rename to config/rootfiles/oldcore/106/filelists/usb_modeswitch_data diff --git a/config/rootfiles/oldcore/106/meta b/config/rootfiles/oldcore/106/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/106/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/oldcore/106/update.sh similarity index 100% rename from config/rootfiles/core/106/update.sh rename to config/rootfiles/oldcore/106/update.sh diff --git a/make.sh b/make.sh index e30c075bda..d2e32ab0b5 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="106" # Core Level (Filename) +CORE="107" # Core Level (Filename) PAKFIRE_CORE="106" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2