[Pkg-utopia-commits] r90 - packages/hal/trunk/debian

Sjoerd Simons sjoerd@haydn.debian.org
Wed, 17 Nov 2004 10:52:29 -0700


Author: sjoerd
Date: 2004-11-17 10:52:25 -0700 (Wed, 17 Nov 2004)
New Revision: 90

Modified:
   packages/hal/trunk/debian/unmount.dev
Log:
* Use pumount instead of umount to unmount when available.
  Otherwise an mountpoint created by pmount won't be removed and you'll end up
  with usbstick, usbstick-1, usbstick-2 etc. when testing gvm :)


Modified: packages/hal/trunk/debian/unmount.dev
===================================================================
--- packages/hal/trunk/debian/unmount.dev	2004-11-17 15:31:57 UTC (rev 89)
+++ packages/hal/trunk/debian/unmount.dev	2004-11-17 17:52:25 UTC (rev 90)
@@ -1,8 +1,13 @@
 #!/bin/sh
-
-# Lazily unmount drives which are removed, but still unmounted
+# Lazily unmount drives which are removed, but still mounted
 if [ "$ACTION" = remove ] && grep -q "^$DEVNAME" /proc/mounts; then
-    umount -l "$DEVNAME"
+  if [ -x /usr/bin/pumount ] ; then 
+    /usr/bin/pumount -l "$DEVNAME";
+    echo "puh"
+  else 
+    /bin/umount -l "$DEVNAME"
+    echo "muh"
+  fi
 fi
 
 exit 0