[maemo-commits] [maemo-commits] r14495 - in projects/haf/trunk/osso-app-killer: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-18 09:49:01 +0300 (Thu, 18 Oct 2007)
New Revision: 14495

Modified:
   projects/haf/trunk/osso-app-killer/debian/changelog
   projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh
   projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh
Log:
brought fixes from 1.16-1fix


Modified: projects/haf/trunk/osso-app-killer/debian/changelog
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/changelog	2007-10-17 21:02:54 UTC (rev 14494)
+++ projects/haf/trunk/osso-app-killer/debian/changelog	2007-10-18 06:49:01 UTC (rev 14495)
@@ -1,6 +1,7 @@
 osso-app-killer (1.17-1~unreleased) unstable; urgency=low
 
   * Remove 'empty' GConf directories. Fixes: NB#72357
+  * Backported CUD fixes from 1.16-1fix.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 16 Oct 2007 14:19:46 +0300
 

Modified: projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh	2007-10-17 21:02:54 UTC (rev 14494)
+++ projects/haf/trunk/osso-app-killer/src/osso-app-killer-cud.sh	2007-10-18 06:49:01 UTC (rev 14495)
@@ -3,7 +3,7 @@
 #
 # This file is part of osso-app-killer.
 #
-# Copyright (C) 2005-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2005-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -42,6 +42,15 @@
 source $DIR/af-defines.sh
 
 # shut down things
+if [ -x /etc/init.d/hildon-desktop ]; then
+  $SUDO /etc/init.d/hildon-desktop stop
+fi
+if [ -x /etc/init.d/metalayer-crawler0 ]; then
+  $SUDO /etc/init.d/metalayer-crawler0 stop
+fi
+if [ -x /etc/init.d/mediaplayer-daemon ]; then
+  $SUDO /etc/init.d/mediaplayer-daemon stop
+fi
 $SUDO /etc/init.d/af-base-apps stop
 $SUDO $DIR/gconf-daemon.sh stop
 

Modified: projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh	2007-10-17 21:02:54 UTC (rev 14494)
+++ projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh	2007-10-18 06:49:01 UTC (rev 14495)
@@ -24,7 +24,9 @@
 fi
 if [ "x$DEV" != "x" ]; then
   echo "Internal memory card device is $DEV"
+  sleep 5
   $SUDO /etc/init.d/ke-recv stop
+  sleep 5
   $SUDO /bin/umount /media/mmc2
   $SUDO /usr/sbin/osso-prepare-partition.sh $DEV
   if [ $? = 0 ]; then