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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-11-11 16:41:31 +0200 (Tue, 11 Nov 2008)
New Revision: 16625

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-startup
   projects/haf/trunk/osso-af-startup/top-scripts/af-startup
Log:
  * Moving creation/destruction of /tmp/first-boot-flag-tmp to real-af-startup
  * Fixes: NB#90795


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-11 08:22:37 UTC (rev 16624)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-11-11 14:41:31 UTC (rev 16625)
@@ -1,6 +1,8 @@
-osso-af-startup (1.70-2unreleased0) unstable; urgency=low
+osso-af-startup (1.71-1) unstable; urgency=low
 
   * Added init script to save clock state to hw: top-scripts/hwclock
+  * Moving creation/destruction of /tmp/first-boot-flag-tmp to real-af-startup
+  * Fixes: NB#90795
 
  -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed,  8 Oct 2008 14:22:55 +0300
 

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-11-11 08:22:37 UTC (rev 16624)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-11-11 14:41:31 UTC (rev 16625)
@@ -33,6 +33,9 @@
 
 case "$1" in
 start)
+  if [ -e $HOME/first-boot-flag ]; then
+    touch /tmp/first-boot-flag-tmp
+  fi
 
   # this is used by the input methods for disabling features in startup
   touch /tmp/im_disable_tools_menu
@@ -157,6 +160,7 @@
     # the storage media before removing first-boot-flag.
     sync
     rm -f $HOME/first-boot-flag
+    rm -f /tmp/first-boot-flag-tmp
     rm -f /tmp/suw-user-cancelled.tmp
     touch /tmp/.check_auto_install
 

Modified: projects/haf/trunk/osso-af-startup/top-scripts/af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2008-11-11 08:22:37 UTC (rev 16624)
+++ projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2008-11-11 14:41:31 UTC (rev 16625)
@@ -50,7 +50,6 @@
 	  /etc/init.d/btcond start
 	  /etc/init.d/bluez-utils start
 	  /etc/init.d/wlancond start
-	  touch /tmp/first-boot-flag-tmp
 	fi
 
         if [ -x /etc/init.d/startup-greeting.sh ]; then