[maemo-commits] [maemo-commits] r14067 - in projects/haf/trunk/osso-af-startup: debian top-scripts

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-25 14:27:21 +0300 (Tue, 25 Sep 2007)
New Revision: 14067

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/top-scripts/af-startup
Log:
patch from Andrey for removing a flag file


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-09-25 10:57:33 UTC (rev 14066)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-09-25 11:27:21 UTC (rev 14067)
@@ -1,3 +1,10 @@
+osso-af-startup (1.47-1~unreleased) unstable; urgency=low
+
+  * /tmp/first-boot-flag-tmp removed before checking for the first boot flag.
+    Patch from Andrey Petrov. Fixes: NB#69841
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 25 Sep 2007 14:21:38 +0300
+
 osso-af-startup (1.46-5) unstable; urgency=low
 
   * Do not quit wizback after the wizards, but obscure it with osso-startup-greeting

Modified: projects/haf/trunk/osso-af-startup/top-scripts/af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2007-09-25 10:57:33 UTC (rev 14066)
+++ projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2007-09-25 11:27:21 UTC (rev 14067)
@@ -34,6 +34,13 @@
 	# in case of first boot, start services requiered by
 	# startup wizards. Touch a temporary flag file so these
 	# services won't start twice
+	
+	# first remove the tmp flag if it is already there. This 
+	# happens if we get back to this runlevel without rebooting
+	
+	if [ -e /tmp/first-boot-flag-tmp ]; then
+	  rm -rf /tmp/first-boot-flag-tmp
+	fi
 
 	if [ -e /home/user/first-boot-flag ]; then
 	  /etc/init.d/dnsmasq start