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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-12-23 11:13:46 -0700 (Thu, 23 Dec 2004)
New Revision: 148

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal-unmount.dev
Log:
* Improve the hal unmount script to also check mtab
  


Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-12-22 21:30:45 UTC (rev 147)
+++ packages/hal/trunk/debian/changelog	2004-12-23 18:13:46 UTC (rev 148)
@@ -1,7 +1,10 @@
-hal (0.4.2-4) unstable; urgency=low
+hal (0.4.2-4) unstable; urgency=high
 
   * Only add hal to group cdrom and floppy when creating the user. This way it
     won't get added on upgrade if the admin removed it. (Closes: #286790)
+  * debian/hal-unmount.dev
+    + Also check /etc/mtab to see if the device is mounted. (Closes: #286579)
+  * Urgency high. Fixes an RC bug.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Sun, 19 Dec 2004 20:42:37 +0100
 
@@ -12,7 +15,7 @@
     encoded in octal from. Decode these into normal chars again. Fixes
     problems with spaces in mountpoints (Closes: #284322)
   * debian/hal-unmount.dev:
-    - Sanity-check $DEVNAME to make sure it begins with a slash, so we don't 
+    + Sanity-check $DEVNAME to make sure it begins with a slash, so we don't 
       get bitten by DEVNAME=-a or DEVNAME="". Thanks to Scott James Remnant
 
  -- Sjoerd Simons <sjoerd@debian.org>  Sun, 19 Dec 2004 18:32:47 +0100

Modified: packages/hal/trunk/debian/hal-unmount.dev
===================================================================
--- packages/hal/trunk/debian/hal-unmount.dev	2004-12-22 21:30:45 UTC (rev 147)
+++ packages/hal/trunk/debian/hal-unmount.dev	2004-12-23 18:13:46 UTC (rev 148)
@@ -4,11 +4,12 @@
 [ "$DEVNAME" != "${DEVNAME#/}" ] || exit 0
 
 # Lazily unmount drives which are removed, but still mounted
-if [ "$ACTION" = remove ] && grep -q "^$DEVNAME" /proc/mounts; then
+if [ "$ACTION" = remove ] \
+   && (grep -q "^$DEVNAME" /proc/mounts || grep -q "^$DEVNAME" /etc/mtab); then
   if [ -x /usr/bin/pumount ] ; then 
     /usr/bin/pumount -l "$DEVNAME";
   else 
-    /bin/umount -l "$DEVNAME"
+    /bin/umount -l "$DEVNAME";
   fi
 fi