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 b72f127ce5f4f60fe8e83de72fe01d734d345379..e15417ea60dfeb02479504fb74c4a4ad4b719dfc 100644 (file)
--- 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 4d1b43cdcefa58422045258e44b46a8af19e044f..1d4bd530687bfffe72c1859c064503320c375a85 100644 (file)
--- 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 afd4aecdc4cc9ad98b39553b4e988975e373f165..49cb067c1b89e95bebf55878ea7647b2aa34687c 100644 (file)
--- 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