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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-06-21 13:00:58 +0300 (Thu, 21 Jun 2007)
New Revision: 12411

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/real-af-base-apps
   projects/haf/trunk/osso-af-startup/top-scripts/af-startup
Log:
patch from Andrey Petrov


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-06-21 09:38:39 UTC (rev 12410)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-06-21 10:00:58 UTC (rev 12411)
@@ -1,3 +1,9 @@
+osso-af-startup (1.44-1) unstable; urgency=low
+
+  * Patch from Andrey Petrov to reduce startup time. Fixes: NB#60087
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 21 Jun 2007 12:57:21 +0300
+
 osso-af-startup (1.43-1) unstable; urgency=low
 
   * Applied patch from Tapani to add hildon-update-notifier startup.

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-06-21 09:38:39 UTC (rev 12410)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-06-21 10:00:58 UTC (rev 12411)
@@ -33,7 +33,7 @@
 
 update-rc.d af-services start 22 2 3 4 5 . stop 22 0 1 6 . > /dev/null
 update-rc.d af-startup start 50 2 3 4 . stop 21 0 1 6 . > /dev/null
-update-rc.d af-base-apps start 51 2 3 4 . stop 20 0 1 5 6 . > /dev/null
+update-rc.d af-base-apps start 60 2 3 4 . stop 20 0 1 5 6 . > /dev/null
 
 # create memory card mount points ("if" is for Scratchbox)
 if [ -w / ]; then

Modified: projects/haf/trunk/osso-af-startup/services/real-af-base-apps
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-06-21 09:38:39 UTC (rev 12410)
+++ projects/haf/trunk/osso-af-startup/services/real-af-base-apps	2007-06-21 10:00:58 UTC (rev 12411)
@@ -23,11 +23,7 @@
 start)
 
   source $SESSION_BUS_ADDRESS_FILE
-  source $AF_INIT_DIR/hildon-desktop.sh start
 
-  # boost desktop startup
-  sleep 9
-
   if [ -f /tmp/run-osso-backup-finish-restore ]; then
     $AF_INIT_DIR/osso-backup-finish-restore.sh
     rm -f /tmp/run-osso-backup-finish-restore
@@ -66,8 +62,6 @@
     source $CONNECTIVITY_UI_SCRIPT stop
   fi
 
-  source $AF_INIT_DIR/hildon-desktop.sh stop
-
   ;;
 restart)
   echo "$0: not implemented"

Modified: projects/haf/trunk/osso-af-startup/top-scripts/af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2007-06-21 09:38:39 UTC (rev 12410)
+++ projects/haf/trunk/osso-af-startup/top-scripts/af-startup	2007-06-21 10:00:58 UTC (rev 12411)
@@ -31,6 +31,19 @@
         #
         /etc/init.d/fb-progress.sh stop
 
+	# in case of first boot, start services requiered by
+	# startup wizards. Touch a temporary flag file so these
+	# services won't start twice
+
+	if [ -e /home/user/first-boot-flag ]; then
+	  /etc/init.d/dnsmasq start
+	  /etc/init.d/btcond start
+	  /etc/init.d/bluez-utils start
+	  /etc/init.d/wlancond start
+	  /etc/init.d/osso-ic start
+	  touch /tmp/first-boot-flag-tmp
+	fi
+
         if [ -x /etc/init.d/startup-greeting.sh ]; then
           /etc/init.d/startup-greeting.sh start
         fi