This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via a97d2fb794f33875a6211a4b337e39f02df4af75 (commit) via 407f18cdbb7006f13f733c9aece62826a85ffde6 (commit) via 8b297455a580260c50cf6d9d8e11c5952cb32b9b (commit) via 015b3e08d87a09b1cc93ca1fa5783205d0acdd91 (commit) from e701e24fb29854f609ccf72680e88e3041c2fa6e (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a97d2fb794f33875a6211a4b337e39f02df4af75 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 15 09:24:50 2018 +0200

core122: add code needed for kernel update

force reinstall pae kernel, update /boot/uenv.txt

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

commit 407f18cdbb7006f13f733c9aece62826a85ffde6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 15 09:12:23 2018 +0200

core121: add files for version update

setup and pakfire conf needed to ship and pakfire needs to rerun after the version change to use the new pakfire trees and load core122.

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

commit 8b297455a580260c50cf6d9d8e11c5952cb32b9b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 15 08:56:23 2018 +0200

core122: remove arm check

The update will not pushed to old arm trees so the check is useless

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

commit 015b3e08d87a09b1cc93ca1fa5783205d0acdd91 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 15 08:52:51 2018 +0200

core121: split into core121 and 122

linux firmware and kernel is too large for one core update

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

-----------------------------------------------------------------------

Summary of changes: .../core/121/filelists/armv5tel/linux-initrd-rpi | 1 - .../core/121/filelists/armv5tel/linux-rpi | 1 - config/rootfiles/core/121/filelists/files | 18 +---- config/rootfiles/core/121/update.sh | 83 +++++++--------------- config/rootfiles/core/{121 => 122}/exclude | 0 config/rootfiles/core/{121 => 122}/filelists/acpid | 0 .../rootfiles/core/{121 => 122}/filelists/apache2 | 0 config/rootfiles/core/{121 => 122}/filelists/apr | 0 .../rootfiles/core/{121 => 122}/filelists/aprutil | 0 .../core/{121 => 122}/filelists/armv5tel/files | 0 .../filelists/armv5tel/linux-initrd-kirkwood | 0 .../filelists/armv5tel/linux-initrd-multi | 0 .../{121 => 122}/filelists/armv5tel/linux-kirkwood | 0 .../{121 => 122}/filelists/armv5tel/linux-multi | 0 .../{121 => 122}/filelists/armv5tel/rpi-firmware | 0 .../core/{121 => 122}/filelists/armv5tel/u-boot | 0 .../filelists/armv5tel/u-boot-kirkwood | 0 .../{121 => 122}/filelists/armv5tel/u-boot-mkimage | 0 config/rootfiles/core/{121 => 122}/filelists/beep | 0 config/rootfiles/core/{121 => 122}/filelists/cmake | 0 config/rootfiles/core/{121 => 122}/filelists/crda | 0 config/rootfiles/core/{121 => 122}/filelists/dhcp | 0 config/rootfiles/core/{121 => 122}/filelists/files | 2 - config/rootfiles/core/{121 => 122}/filelists/flex | 0 .../core/{121 => 122}/filelists/i586/grub | 0 .../{121 => 122}/filelists/i586/intel-microcode | 0 .../core/{121 => 122}/filelists/i586/linux | 0 .../core/{121 => 122}/filelists/i586/linux-initrd | 0 config/rootfiles/core/{121 => 122}/filelists/iw | 0 .../rootfiles/core/{121 => 122}/filelists/jwhois | 0 .../rootfiles/core/{121 => 122}/filelists/libidn | 0 .../core/{121 => 122}/filelists/multipath-tools | 0 config/rootfiles/core/{121 => 122}/filelists/pcre | 0 config/rootfiles/core/{121 => 122}/filelists/tar | 0 .../rootfiles/core/{121 => 122}/filelists/unbound | 0 config/rootfiles/core/{121 => 122}/filelists/wget | 0 .../core/{121 => 122}/filelists/x86_64/grub | 0 .../{121 => 122}/filelists/x86_64/intel-microcode | 0 .../core/{121 => 122}/filelists/x86_64/linux | 0 .../{121 => 122}/filelists/x86_64/linux-initrd | 0 .../core/{121 => 122}/filelists/xtables-addons | 0 config/rootfiles/core/{121 => 122}/meta | 0 config/rootfiles/core/{121 => 122}/update.sh | 45 +++++++++--- make.sh | 2 +- 44 files changed, 65 insertions(+), 87 deletions(-) delete mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi delete mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-rpi copy config/rootfiles/core/{121 => 122}/exclude (100%) rename config/rootfiles/core/{121 => 122}/filelists/acpid (100%) rename config/rootfiles/core/{121 => 122}/filelists/apache2 (100%) rename config/rootfiles/core/{121 => 122}/filelists/apr (100%) rename config/rootfiles/core/{121 => 122}/filelists/aprutil (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/files (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/linux-initrd-kirkwood (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/u-boot (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/u-boot-kirkwood (100%) rename config/rootfiles/core/{121 => 122}/filelists/armv5tel/u-boot-mkimage (100%) rename config/rootfiles/core/{121 => 122}/filelists/beep (100%) rename config/rootfiles/core/{121 => 122}/filelists/cmake (100%) rename config/rootfiles/core/{121 => 122}/filelists/crda (100%) rename config/rootfiles/core/{121 => 122}/filelists/dhcp (100%) copy config/rootfiles/core/{121 => 122}/filelists/files (90%) rename config/rootfiles/core/{121 => 122}/filelists/flex (100%) rename config/rootfiles/core/{121 => 122}/filelists/i586/grub (100%) rename config/rootfiles/core/{121 => 122}/filelists/i586/intel-microcode (100%) rename config/rootfiles/core/{121 => 122}/filelists/i586/linux (100%) rename config/rootfiles/core/{121 => 122}/filelists/i586/linux-initrd (100%) rename config/rootfiles/core/{121 => 122}/filelists/iw (100%) rename config/rootfiles/core/{121 => 122}/filelists/jwhois (100%) rename config/rootfiles/core/{121 => 122}/filelists/libidn (100%) rename config/rootfiles/core/{121 => 122}/filelists/multipath-tools (100%) rename config/rootfiles/core/{121 => 122}/filelists/pcre (100%) rename config/rootfiles/core/{121 => 122}/filelists/tar (100%) rename config/rootfiles/core/{121 => 122}/filelists/unbound (100%) rename config/rootfiles/core/{121 => 122}/filelists/wget (100%) rename config/rootfiles/core/{121 => 122}/filelists/x86_64/grub (100%) rename config/rootfiles/core/{121 => 122}/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/core/{121 => 122}/filelists/x86_64/linux (100%) rename config/rootfiles/core/{121 => 122}/filelists/x86_64/linux-initrd (100%) copy config/rootfiles/core/{121 => 122}/filelists/xtables-addons (100%) copy config/rootfiles/core/{121 => 122}/meta (100%) copy config/rootfiles/core/{121 => 122}/update.sh (75%)

Difference in files: diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi deleted file mode 120000 index 828106757..000000000 --- a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-initrd-rpi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a498f..000000000 --- a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files index a0bb9423c..e15417ea6 100644 --- a/config/rootfiles/core/121/filelists/files +++ b/config/rootfiles/core/121/filelists/files @@ -1,20 +1,6 @@ etc/system-release etc/issue -etc/rc.d/init.d/acpid -etc/rc.d/init.d/collectd -etc/rc.d/init.d/firstsetup -etc/rc.d/init.d/leds -etc/rc.d/init.d/partresize etc/rc.d/init.d/rngd -etc/rc.d/rc0.d/K87acpid -etc/rc.d/rc3.d/S12acpid -etc/rc.d/rc6.d/K87acpid etc/ssl/certs/ca-bundle.crt -srv/web/ipfire/cgi-bin/entropy.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/remote.cgi -usr/lib/firewall/firewall-lib.pl -var/ipfire/langs -var/ipfire/qos/bin/makeqosscripts.pl +opt/pakfire/etc/pakfire.conf +usr/sbin/setup diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index f0eb15911..1d4bd5306 100644 --- a/config/rootfiles/core/121/update.sh +++ b/config/rootfiles/core/121/update.sh @@ -39,42 +39,6 @@ for (( i=1; i<=$core; i++ )); do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done

-# This update cannot be applied on ARM -case "$(uname -a)" in - arm*) - exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1 - ;; -esac - -# Do some sanity checks. -case $(uname -r) in - *-ipfire*) - # Ok. - ;; - *) - exit_with_error "ERROR cannot update. No IPFire Kernel." 1 - ;; -esac - -# 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 - -# Remove the old kernel -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

# Stop services

@@ -85,27 +49,12 @@ extract_files ldconfig

# Update Language cache -/usr/local/bin/update-lang-cache - -# Remove Nagios files, if any... -rm -rvf \ - /etc/rc.d/init.d/nagios \ - /usr/bin/nagios \ - /etc/rc.d/rc6.d/K33nagios \ - /etc/rc.d/rc3.d/off/S67nagios \ - /etc/rc.d/rc0.d/K33nagios \ - /etc/httpd/conf/conf.d/nagios.conf \ - /etc/nagios/nagios.cfg \ - /usr/bin/p1.pl \ - /usr/bin/nagiostats \ - /usr/share/nagios/ \ - /var/nagios/

# Start services /etc/init.d/apache restart

# This update needs a reboot... -touch /var/run/need_reboot +#touch /var/run/need_reboot

# Finish /etc/init.d/fireinfo start @@ -116,13 +65,31 @@ if [ -e /boot/grub/grub.cfg ]; then grub-mkconfig -o /boot/grub/grub.cfg fi

-sync

-# Reload microcode -modprobe microcode -if [ -w "/sys/devices/system/cpu/microcode/reload" ]; - echo 1 > /sys/devices/system/cpu/microcode/reload -fi +# +# 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

# Don't report the exitcode last command exit 0 diff --git a/config/rootfiles/core/122/exclude b/config/rootfiles/core/122/exclude new file mode 100644 index 000000000..d6fd053b6 --- /dev/null +++ b/config/rootfiles/core/122/exclude @@ -0,0 +1,30 @@ +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/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/121/filelists/acpid b/config/rootfiles/core/122/filelists/acpid similarity index 100% rename from config/rootfiles/core/121/filelists/acpid rename to config/rootfiles/core/122/filelists/acpid diff --git a/config/rootfiles/core/121/filelists/apache2 b/config/rootfiles/core/122/filelists/apache2 similarity index 100% rename from config/rootfiles/core/121/filelists/apache2 rename to config/rootfiles/core/122/filelists/apache2 diff --git a/config/rootfiles/core/121/filelists/apr b/config/rootfiles/core/122/filelists/apr similarity index 100% rename from config/rootfiles/core/121/filelists/apr rename to config/rootfiles/core/122/filelists/apr diff --git a/config/rootfiles/core/121/filelists/aprutil b/config/rootfiles/core/122/filelists/aprutil similarity index 100% rename from config/rootfiles/core/121/filelists/aprutil rename to config/rootfiles/core/122/filelists/aprutil diff --git a/config/rootfiles/core/121/filelists/armv5tel/files b/config/rootfiles/core/122/filelists/armv5tel/files similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/files rename to config/rootfiles/core/122/filelists/armv5tel/files diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/core/122/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/core/122/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/core/122/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-multi b/config/rootfiles/core/122/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/linux-multi rename to config/rootfiles/core/122/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/122/filelists/armv5tel/rpi-firmware similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/rpi-firmware rename to config/rootfiles/core/122/filelists/armv5tel/rpi-firmware diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot b/config/rootfiles/core/122/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot rename to config/rootfiles/core/122/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood b/config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood rename to config/rootfiles/core/122/filelists/armv5tel/u-boot-kirkwood diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage b/config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage similarity index 100% rename from config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage rename to config/rootfiles/core/122/filelists/armv5tel/u-boot-mkimage diff --git a/config/rootfiles/core/121/filelists/beep b/config/rootfiles/core/122/filelists/beep similarity index 100% rename from config/rootfiles/core/121/filelists/beep rename to config/rootfiles/core/122/filelists/beep diff --git a/config/rootfiles/core/121/filelists/cmake b/config/rootfiles/core/122/filelists/cmake similarity index 100% rename from config/rootfiles/core/121/filelists/cmake rename to config/rootfiles/core/122/filelists/cmake diff --git a/config/rootfiles/core/121/filelists/crda b/config/rootfiles/core/122/filelists/crda similarity index 100% rename from config/rootfiles/core/121/filelists/crda rename to config/rootfiles/core/122/filelists/crda diff --git a/config/rootfiles/core/121/filelists/dhcp b/config/rootfiles/core/122/filelists/dhcp similarity index 100% rename from config/rootfiles/core/121/filelists/dhcp rename to config/rootfiles/core/122/filelists/dhcp diff --git a/config/rootfiles/core/122/filelists/files b/config/rootfiles/core/122/filelists/files new file mode 100644 index 000000000..f7c692d8b --- /dev/null +++ b/config/rootfiles/core/122/filelists/files @@ -0,0 +1,18 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/acpid +etc/rc.d/init.d/collectd +etc/rc.d/init.d/firstsetup +etc/rc.d/init.d/leds +etc/rc.d/init.d/partresize +etc/rc.d/rc0.d/K87acpid +etc/rc.d/rc3.d/S12acpid +etc/rc.d/rc6.d/K87acpid +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/remote.cgi +usr/lib/firewall/firewall-lib.pl +var/ipfire/langs +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/121/filelists/flex b/config/rootfiles/core/122/filelists/flex similarity index 100% rename from config/rootfiles/core/121/filelists/flex rename to config/rootfiles/core/122/filelists/flex diff --git a/config/rootfiles/core/121/filelists/i586/grub b/config/rootfiles/core/122/filelists/i586/grub similarity index 100% rename from config/rootfiles/core/121/filelists/i586/grub rename to config/rootfiles/core/122/filelists/i586/grub diff --git a/config/rootfiles/core/121/filelists/i586/intel-microcode b/config/rootfiles/core/122/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/i586/intel-microcode rename to config/rootfiles/core/122/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/121/filelists/i586/linux b/config/rootfiles/core/122/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux rename to config/rootfiles/core/122/filelists/i586/linux diff --git a/config/rootfiles/core/121/filelists/i586/linux-initrd b/config/rootfiles/core/122/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/i586/linux-initrd rename to config/rootfiles/core/122/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/121/filelists/iw b/config/rootfiles/core/122/filelists/iw similarity index 100% rename from config/rootfiles/core/121/filelists/iw rename to config/rootfiles/core/122/filelists/iw diff --git a/config/rootfiles/core/121/filelists/jwhois b/config/rootfiles/core/122/filelists/jwhois similarity index 100% rename from config/rootfiles/core/121/filelists/jwhois rename to config/rootfiles/core/122/filelists/jwhois diff --git a/config/rootfiles/core/121/filelists/libidn b/config/rootfiles/core/122/filelists/libidn similarity index 100% rename from config/rootfiles/core/121/filelists/libidn rename to config/rootfiles/core/122/filelists/libidn diff --git a/config/rootfiles/core/121/filelists/multipath-tools b/config/rootfiles/core/122/filelists/multipath-tools similarity index 100% rename from config/rootfiles/core/121/filelists/multipath-tools rename to config/rootfiles/core/122/filelists/multipath-tools diff --git a/config/rootfiles/core/121/filelists/pcre b/config/rootfiles/core/122/filelists/pcre similarity index 100% rename from config/rootfiles/core/121/filelists/pcre rename to config/rootfiles/core/122/filelists/pcre diff --git a/config/rootfiles/core/121/filelists/tar b/config/rootfiles/core/122/filelists/tar similarity index 100% rename from config/rootfiles/core/121/filelists/tar rename to config/rootfiles/core/122/filelists/tar diff --git a/config/rootfiles/core/121/filelists/unbound b/config/rootfiles/core/122/filelists/unbound similarity index 100% rename from config/rootfiles/core/121/filelists/unbound rename to config/rootfiles/core/122/filelists/unbound diff --git a/config/rootfiles/core/121/filelists/wget b/config/rootfiles/core/122/filelists/wget similarity index 100% rename from config/rootfiles/core/121/filelists/wget rename to config/rootfiles/core/122/filelists/wget diff --git a/config/rootfiles/core/121/filelists/x86_64/grub b/config/rootfiles/core/122/filelists/x86_64/grub similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/grub rename to config/rootfiles/core/122/filelists/x86_64/grub diff --git a/config/rootfiles/core/121/filelists/x86_64/intel-microcode b/config/rootfiles/core/122/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/intel-microcode rename to config/rootfiles/core/122/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/121/filelists/x86_64/linux b/config/rootfiles/core/122/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux rename to config/rootfiles/core/122/filelists/x86_64/linux diff --git a/config/rootfiles/core/121/filelists/x86_64/linux-initrd b/config/rootfiles/core/122/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/121/filelists/x86_64/linux-initrd rename to config/rootfiles/core/122/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/122/filelists/xtables-addons b/config/rootfiles/core/122/filelists/xtables-addons new file mode 120000 index 000000000..2e24c4298 --- /dev/null +++ b/config/rootfiles/core/122/filelists/xtables-addons @@ -0,0 +1 @@ +../../../common/xtables-addons \ No newline at end of file diff --git a/config/rootfiles/core/122/meta b/config/rootfiles/core/122/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/122/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh new file mode 100644 index 000000000..6105bf280 --- /dev/null +++ b/config/rootfiles/core/122/update.sh @@ -0,0 +1,157 @@ +#!/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) 2018 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=122 + +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 + +KVER="xxxKVERxxx" + +# Backup uEnv.txt if exist +if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org +fi + +# Do some sanity checks. +case $(uname -r) in + *-ipfire*) + # Ok. + ;; + *) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + +# 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 + +# Remove the old kernel +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 + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Remove Nagios files, if any... +rm -rvf \ + /etc/rc.d/init.d/nagios \ + /usr/bin/nagios \ + /etc/rc.d/rc6.d/K33nagios \ + /etc/rc.d/rc3.d/off/S67nagios \ + /etc/rc.d/rc0.d/K33nagios \ + /etc/httpd/conf/conf.d/nagios.conf \ + /etc/nagios/nagios.cfg \ + /usr/bin/p1.pl \ + /usr/bin/nagiostats \ + /usr/share/nagios/ \ + /var/nagios/ + +# Start services +/etc/init.d/apache restart + +# 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 + +# This update needs 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 + +# Reload microcode +modprobe microcode +if [ -w "/sys/devices/system/cpu/microcode/reload" ]; + echo 1 > /sys/devices/system/cpu/microcode/reload +fi + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index e8591f363..d9752756a 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.21" # Version number -CORE="121" # Core Level (Filename) +CORE="122" # Core Level (Filename) PAKFIRE_CORE="120" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan

hooks/post-receive -- IPFire 2.x development tree