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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-22 13:02:40 -0700 (Mon, 22 Nov 2004)
New Revision: 117

Added:
   packages/hal/trunk/debian/hal-unmount.dev
Removed:
   packages/hal/trunk/debian/unmount.dev
Modified:
   packages/hal/trunk/debian/rules
Log:
* Move the umount script into /etc/dev.d/block
* Give it a more recognizable name (aka put hal in the name)



Copied: packages/hal/trunk/debian/hal-unmount.dev (from rev 104, packages/hal/trunk/debian/unmount.dev)

Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules	2004-11-19 21:58:43 UTC (rev 116)
+++ packages/hal/trunk/debian/rules	2004-11-22 20:02:40 UTC (rev 117)
@@ -23,8 +23,8 @@
 		$(DEB_DESTDIR)/etc/dbus-1/event.d/20hal
 	
 	# helper scripts and settings for when running with dropped priviledges
-	install -m 755 -D debian/unmount.dev \
-		$(DEB_DESTDIR)/etc/dev.d/default/unmount.dev
+	install -m 755 -D debian/hal-unmount.dev \
+		$(DEB_DESTDIR)/etc/dev.d/block/hal-unmount.dev
 	install -m 755 -D debian/hal.udev.device-removable.sh \
 	  $(DEB_DESTDIR)/etc/udev/scripts/device-removable.sh
 	install -m 644 -D debian/hal.udev.rules \

Deleted: packages/hal/trunk/debian/unmount.dev
===================================================================
--- packages/hal/trunk/debian/unmount.dev	2004-11-19 21:58:43 UTC (rev 116)
+++ packages/hal/trunk/debian/unmount.dev	2004-11-22 20:02:40 UTC (rev 117)
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Lazily unmount drives which are removed, but still mounted
-if [ "$ACTION" = remove ] && grep -q "^$DEVNAME" /proc/mounts; then
-  if [ -x /usr/bin/pumount ] ; then 
-    /usr/bin/pumount -l "$DEVNAME";
-    echo "puh"
-  else 
-    /bin/umount -l "$DEVNAME"
-    echo "muh"
-  fi
-fi
-
-exit 0