From: Nils Kneuper <crazy-ivanovic@gmx.net>
Date: Sat, 15 Oct 2011 12:18:18 +0000 (+0200)
Subject: make sure that the "pandora" specific packages are installed last
X-Git-Tag: sz_beta3~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f6f7d2fe4161d7b3e310deb825bc6409b1b60e1;p=pandora-misc.git

make sure that the "pandora" specific packages are installed last
this way config files will be forcefully overwritten by the ones that
come from the openpandora team
---

diff --git a/hotfix_updater/get_packages.sh b/hotfix_updater/get_packages.sh
index 6be74bb..4c1cf9d 100755
--- a/hotfix_updater/get_packages.sh
+++ b/hotfix_updater/get_packages.sh
@@ -113,6 +113,10 @@ wget --no-clobber -i $TMP2.kernel
 cd $PACKAGES_FOLDER/other
 wget --no-clobber -i $TMP2.other
 
+# move packages that are supposed to be openpandora specific into an extra folder which is installed last!
+mkdir $PACKAGES_FOLDER/pandora
+mv $PACKAGES_FOLDER/other/pandora*ipk $PACKAGES_FOLDER/pandora/
+
 # cleanup all the remaining temp files
 rm -f $TMP1 $TMP2 $TMP2.kernel $TMP2.other
 
diff --git a/hotfix_updater/hotfix/updater.sh b/hotfix_updater/hotfix/updater.sh
index 987f0de..49ca785 100755
--- a/hotfix_updater/hotfix/updater.sh
+++ b/hotfix_updater/hotfix/updater.sh
@@ -250,10 +250,10 @@ then
 		# $3 end percentage for zenity (int!)
 		# $4 step width for zenity ($4 percent point per gui update / opkg run)
 		# $5 message displayed in zenity during the update
-		install_all_ipk_in_folder packages/kernel 7 65 6 "# Updating Kernel Modules... this will take a while..."
+		install_all_ipk_in_folder packages/kernel 7 50 6 "# Updating Kernel Modules... this will take a while..."
 	fi     
 
-	echo "65"
+	echo "50"
 	echo "# Updating kernel if needed"
 
 	kernel_known=false
@@ -289,7 +289,7 @@ then
 	#
 
 
-	echo "70"
+	echo "55"
 	echo "# U-Boot if needed"
 
 	if [ -f u-boot.bin ];
@@ -330,7 +330,7 @@ then
 	fi
 
 
-	echo "75"
+	echo "60"
 	echo "# Preparing OS update."
 
 
@@ -344,16 +344,17 @@ then
 	# $3 end percentage for zenity (int!)
 	# $4 step width for zenity ($4 percent point per gui update / opkg run)
 	# $5 message displayed in zenity during the update
-	install_all_ipk_in_folder packages/other 80 95 6 "# Updating OS... this will take a while."
+	install_all_ipk_in_folder packages/other 60 80 6 "# Updating OS... this will take a while."
 
-	# we seem to always want to forcefully overwrite the skel files!
-	if [ -f packages/other/pandora-skel_*ipk ]
-	then
-		for my_package in packages/other/pandora-skel_*ipk
-		do
-			opkg install --force-overwrite --force-overwrite $my_package >> ./opkg.log
-		done
-	fi
+	# Install those packages that come from openpandora.org seperately at the end to make sure that the correct config files are replaced.
+	
+	# call the function for installing ipks
+	# $1 path for packages
+	# $2 start percentage for zenity (int!)
+	# $3 end percentage for zenity (int!)
+	# $4 step width for zenity ($4 percent point per gui update / opkg run)
+	# $5 message displayed in zenity during the update
+	install_all_ipk_in_folder packages/pandora 80 95 6 "# Updating OS... this will take a while."
 
 	log "Packages updated"