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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-02-02 11:31:10 +0200 (Fri, 02 Feb 2007)
New Revision: 9553

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/debian/postinst
   projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
ported fixes from maintenance branch


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-02-02 09:23:27 UTC (rev 9552)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-02-02 09:31:10 UTC (rev 9553)
@@ -2,8 +2,10 @@
 
   * UNRELEASED
   * Ported the memory card buffer flushing fix from maintenance.
+  * anim-shower now has 17 second delay.
+  * Added restarting of osso_hss to the first boot.
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 19 Jan 2007 13:31:46 +0200
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 02 Feb 2007 11:26:38 +0200
 
 osso-af-startup (1.34-1) unstable; urgency=low
 

Modified: projects/haf/trunk/osso-af-startup/debian/postinst
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/postinst	2007-02-02 09:23:27 UTC (rev 9552)
+++ projects/haf/trunk/osso-af-startup/debian/postinst	2007-02-02 09:31:10 UTC (rev 9553)
@@ -71,4 +71,6 @@
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/ke-recv stop'
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/alarmd start'
 add_sudoer 'user ALL = NOPASSWD: /etc/init.d/alarmd stop'
+add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss start'
+add_sudoer 'user ALL = NOPASSWD: /etc/init.d/osso-hss stop'
 

Modified: projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh
===================================================================
--- projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh	2007-02-02 09:23:27 UTC (rev 9552)
+++ projects/haf/trunk/osso-af-startup/services/after-suw-process-restart.sh	2007-02-02 09:31:10 UTC (rev 9553)
@@ -28,6 +28,10 @@
 if [ -x $DIR/osso-media-server.sh ]; then
   $DIR/osso-media-server.sh stop
 fi
+if [ -x /etc/init.d/osso-hss ]; then
+  sudo /etc/init.d/osso-hss stop
+fi
+
 # this is first boot, so VKB is running
 if [ -f $DIR/keyboard.defs ]; then
   source $DIR/keyboard.defs
@@ -63,6 +67,10 @@
 if [ -x $DIR/osso-media-server.sh ]; then
   $DIR/osso-media-server.sh start &
 fi
+if [ -x /etc/init.d/osso-hss ]; then
+  sudo /etc/init.d/osso-hss start
+fi
+
 if [ -x $DIR/osso-connectivity-ui.sh ]; then
   source $DIR/osso-connectivity-ui.sh start
 fi

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-02-02 09:23:27 UTC (rev 9552)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-02-02 09:31:10 UTC (rev 9553)
@@ -56,7 +56,7 @@
       source $AF_INIT_DIR/startup-wizard.sh start
       source $AF_INIT_DIR/af-defines.sh ;# re-read locale variables
       # show progress animation
-      /usr/sbin/anim-shower 10000 &
+      /usr/sbin/anim-shower 17000 &
       # restart processes because the locale might have changed
       source $AF_INIT_DIR/after-suw-process-restart.sh
     fi