[maemo-commits] [maemo-commits] r14169 - in projects/haf/trunk/osso-app-killer: . src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-28 14:38:08 +0300 (Fri, 28 Sep 2007)
New Revision: 14169

Modified:
   projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers
   projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh
Log:
fixes to sudo usage


Modified: projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers
===================================================================
--- projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers	2007-09-28 11:31:55 UTC (rev 14168)
+++ projects/haf/trunk/osso-app-killer/osso-app-killer.sudoers	2007-09-28 11:38:08 UTC (rev 14169)
@@ -1,4 +1,4 @@
-user ALL = NOPASSWD: umount /media/mmc2 
+user ALL = NOPASSWD: /bin/umount /media/mmc2 
 user ALL = NOPASSWD: /usr/sbin/osso-prepare-partition.sh *
-user ALL = NOPASSWD: mkdosfs *
+user ALL = NOPASSWD: /sbin/mkdosfs *
 

Modified: projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh
===================================================================
--- projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh	2007-09-28 11:31:55 UTC (rev 14168)
+++ projects/haf/trunk/osso-app-killer/src/osso-clean-mmc.sh	2007-09-28 11:38:08 UTC (rev 14169)
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+if [ "x$USER" = "xroot" ]; then
+  SUDO=''
+  echo "$0: Warning, I'm root"
+else
+  SUDO='sudo'
+fi
+
 DEV=''
 HOST=`hal-find-by-property --key mmc_host.slot_name --string internal`
 if [ $? = 0 ]; then
@@ -16,11 +23,11 @@
 fi
 if [ "x$DEV" != "x" ]; then
   echo "Internal memory card device is $DEV"
-  sudo umount /media/mmc2
+  $SUDO /bin/umount /media/mmc2
   if [ $? = 0 ]; then
-    sudo /usr/sbin/osso-prepare-partition.sh $DEV
+    $SUDO /usr/sbin/osso-prepare-partition.sh $DEV
     if [ $? = 0 ]; then
-      sudo mkdosfs "${DEV}p1"
+      $SUDO /sbin/mkdosfs "${DEV}p1"
     fi
   fi
 else