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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-23 16:10:11 +0300 (Tue, 23 Oct 2007)
New Revision: 14575

Modified:
   projects/haf/trunk/osso-app-killer/debian/control
   projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh
Log:
added advanced waiting magic to osso-clean-mmc.sh


Modified: projects/haf/trunk/osso-app-killer/debian/control
===================================================================
--- projects/haf/trunk/osso-app-killer/debian/control	2007-10-23 12:38:22 UTC (rev 14574)
+++ projects/haf/trunk/osso-app-killer/debian/control	2007-10-23 13:10:11 UTC (rev 14575)
@@ -7,7 +7,7 @@
 
 Package: osso-app-killer
 Architecture: all
-Depends: osso-af-startup (>= 1.23), dbus, sudo
+Depends: osso-af-startup (>= 1.23), dbus, sudo, lsof
 Description: Collection of scripts for RFS/ROS, CUD, restore.
  Scripts to implement the 'cleansing effect' of Restore Original Settings
  and Clear User Data. Also included is a script to run before the restore

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-23 12:38:22 UTC (rev 14574)
+++ projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh	2007-10-23 13:10:11 UTC (rev 14575)
@@ -24,9 +24,31 @@
 fi
 if [ "x$DEV" != "x" ]; then
   echo "Internal memory card device is $DEV"
-  sleep 5
+
+  # Wait until memory card is not used by applications
+  INC=1
+  while lsof /media/mmc2 > /dev/null; do
+    if [ $INC -gt 10 ]; then
+      echo "$0: memory card still used after 10 seconds"
+      break
+    fi
+    sleep 1
+    INC=`expr $INC + 1`
+  done
+
   $SUDO /etc/init.d/ke-recv stop
-  sleep 5
+
+  # Wait until ke-recv has exited
+  INC=1
+  while pidof ke-recv > /dev/null; do
+    if [ $INC -gt 10 ]; then
+      echo "$0: ke-recv still running after 10 seconds"
+      break
+    fi
+    sleep 1
+    INC=`expr $INC + 1`
+  done
+
   $SUDO /bin/umount /media/mmc2
   $SUDO /usr/sbin/osso-prepare-partition.sh $DEV
   if [ $? = 0 ]; then