Fix core_list.db not found while updating

Made pakfire update --force after update
Removed the "beta2" marking (now again "test")

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 4096c1d2fa5886738ea65439a60d1b03b211aeef..0d37940f99d9753f49dd9ca1ee1f23d917b0c438 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -100,10 +100,6 @@ mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
 #
-# Delete lists of the old version
-#
-rm -f /opt/pakfire/db/lists/*list.db
-#
 # Create new issue
 #
 echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
@@ -124,6 +120,7 @@ echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/remove_obsolet
 echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
 echo 'done'                                               >> /tmp/remove_obsolete_paks
 echo '/opt/pakfire/pakfire remove zaptel -y'              >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire update --force'                >> /tmp/remove_obsolete_paks
 echo 'echo'                                               >> /tmp/remove_obsolete_paks
 echo 'echo Update to IPFire $NEWVERSION finished. Please reboot... ' >> /tmp/remove_obsolete_paks
 echo 'echo'                                               >> /tmp/remove_obsolete_paks

diff --git a/make.sh b/make.sh
index df382ce8d488ab186686ffaa30481bbea25530b7..973b4d59f27b086708f07a401c063d5a0a9dcbb1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-beta2"
+VERSION="2.3-test"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir