[Pkg-utopia-commits] r1272 - packages/unstable/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2007-03-14 15:19:11 +0000 (Wed, 14 Mar 2007)
New Revision: 1272

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal-unmount.sh
Log:
* debian/hal-unmount.sh: Always run pumount/umount if a block device is
  removed, not only when it's mounted. This ensure that dm devices can be
  properly deconfigured by pumount.

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2007-03-14 15:15:02 UTC (rev 1271)
+++ packages/unstable/hal/debian/changelog	2007-03-14 15:19:11 UTC (rev 1272)
@@ -1,11 +1,17 @@
 hal (0.5.8.1-8) unstable; urgency=low
 
+  [ Michael Biebl ]
   * debian/control:
     - Add an explicit build dependency on docbook-xml so we don't fail on
       buildds without network access.
 
- -- Michael Biebl <biebl at debian.org>  Tue, 13 Mar 2007 15:26:18 +0100
+  [ Sjoerd Simons ]
+  * debian/hal-unmount.sh: Always run pumount/umount if a block device is
+    removed, not only when it's mounted. This ensure that dm devices can be
+    properly deconfigured by pumount.
 
+ -- Sjoerd Simons <sjoerd at debian.org>  Wed, 14 Mar 2007 16:16:16 +0100
+
 hal (0.5.8.1-7) unstable; urgency=low
 
   [ Sjoerd Simons ]

Modified: packages/unstable/hal/debian/hal-unmount.sh
===================================================================
--- packages/unstable/hal/debian/hal-unmount.sh	2007-03-14 15:15:02 UTC (rev 1271)
+++ packages/unstable/hal/debian/hal-unmount.sh	2007-03-14 15:19:11 UTC (rev 1272)
@@ -4,8 +4,7 @@
 [ "$DEVNAME" != "${DEVNAME#/}" ] || exit 0
 
 # Lazily unmount drives which are removed, but still mounted
-if [ "$ACTION" = remove ] \
-   && (grep -q "^$DEVNAME" /proc/mounts || grep -q "^$DEVNAME" /etc/mtab); then
+if [ "$ACTION" = remove ] ; then
   if [ -x /usr/bin/pumount ] ; then 
     /usr/bin/pumount -l "$DEVNAME";
   else