From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 15 Jun 2018 07:12:23 +0000 (+0200)
Subject: core121: add files for version update
X-Git-Tag: v2.21-core122~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=407f18cdbb7006f13f733c9aece62826a85ffde6;p=ipfire-2.x.git

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>
---

diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files
index b72f127ce5..e15417ea60 100644
--- a/config/rootfiles/core/121/filelists/files
+++ b/config/rootfiles/core/121/filelists/files
@@ -2,3 +2,5 @@ etc/system-release
 etc/issue
 etc/rc.d/init.d/rngd
 etc/ssl/certs/ca-bundle.crt
+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 4d1b43cdce..1d4bd53068 100644
--- a/config/rootfiles/core/121/update.sh
+++ b/config/rootfiles/core/121/update.sh
@@ -65,6 +65,30 @@ if [ -e /boot/grub/grub.cfg ]; then
 	grub-mkconfig -o /boot/grub/grub.cfg
 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
diff --git a/config/rootfiles/core/122/update.sh b/config/rootfiles/core/122/update.sh
index afd4aecdc4..49cb067c1b 100644
--- a/config/rootfiles/core/122/update.sh
+++ b/config/rootfiles/core/122/update.sh
@@ -98,7 +98,7 @@ rm -rvf \
 /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