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

[Sjoerd Simons]

Author: sjoerd
Date: 2005-08-01 22:36:50 +0000 (Mon, 01 Aug 2005)
New Revision: 261

Added:
   packages/unstable/hal/debian/hal-unmount.sh
Removed:
   packages/unstable/hal/debian/hal-unmount.dev
Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/control
   packages/unstable/hal/debian/hal.install
   packages/unstable/hal/debian/hal.udev.rules
   packages/unstable/hal/debian/rules
Log:
Use udev RUN rules instead hotplug.d and dev.d

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/changelog	2005-08-01 22:36:50 UTC (rev 261)
@@ -1,10 +1,12 @@
 hal (0.4.8-4) unstable; urgency=low
 
   * debian/patches/udev_fix.patch
-    + Correctly coldplug block devices with the latest udev releases 
-      (Closes: #318313)  
+    + Correctly coldplug block devices with the latest udev releases
+      (Closes: #318313)
+  * debian/hal.udev.rules
+    + use RUN udev rules instead of the hotplugd.d and dev.d scripts
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon,  1 Aug 2005 23:38:46 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue,  2 Aug 2005 00:24:38 +0200
 
 hal (0.4.8-3) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/control
===================================================================
--- packages/unstable/hal/debian/control	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/control	2005-08-01 22:36:50 UTC (rev 261)
@@ -7,7 +7,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.056-2)
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.063)
 Conflicts: gnome-volume-manager (<< 0.9.10), pmount (<< 0.4.2)
 Suggests: hal-device-manager
 Description: Hardware Abstraction Layer

Deleted: packages/unstable/hal/debian/hal-unmount.dev
===================================================================
--- packages/unstable/hal/debian/hal-unmount.dev	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/hal-unmount.dev	2005-08-01 22:36:50 UTC (rev 261)
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# sanity check. DEVNAME should start with a /
-[ "$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 [ -x /usr/bin/pumount ] ; then 
-    /usr/bin/pumount -l "$DEVNAME";
-  else 
-    /bin/umount -l "$DEVNAME";
-  fi
-fi
-
-exit 0

Copied: packages/unstable/hal/debian/hal-unmount.sh (from rev 259, packages/unstable/hal/debian/hal-unmount.dev)

Modified: packages/unstable/hal/debian/hal.install
===================================================================
--- packages/unstable/hal/debian/hal.install	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/hal.install	2005-08-01 22:36:50 UTC (rev 261)
@@ -6,4 +6,5 @@
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi
 debian/preferences.fdi  etc/hal/fdi
+debian/hal-unmount.sh /usr/lib/hal/hal-unmount.sh
 debian/ipod-music-player.fdi usr/share/hal/fdi/20freedesktop/

Modified: packages/unstable/hal/debian/hal.udev.rules
===================================================================
--- packages/unstable/hal/debian/hal.udev.rules	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/hal.udev.rules	2005-08-01 22:36:50 UTC (rev 261)
@@ -1,3 +1,10 @@
+# hotplug.d and dev.d are obsolete, so simulate calling of the hal helpers
+ENV{UDEVD_EVENT}=="1" RUN+="/usr/lib/hal/hal.hotplug"
+ENV{UDEVD_EVENT}=="1" RUN+="/usr/lib/hal/hal.dev"
+
+# unmount block devices when they are removed
+ENV{UDEVD_EVENT}=="1", SUBSYSTEM=="block",ACTION="remove", RUN+="/usr/lib/hal/hal-unmount.sh"
+
 # put removable IDE/SCSI devices into the hal group instead of 'disk'
 BUS="scsi",KERNEL="sd[a-z]*", PROGRAM="/etc/udev/scripts/device-removable.sh %k 'usb ieee1394'", RESULT="1", MODE="0640", GROUP="hal"
 # BUS="ide", KERNEL="hd[a-z]*", PROGRAM="/etc/udev/scripts/device-removable.sh  %k 'usb ieee1394'", RESULT="1", MODE="0640", GROUP="hal"

Modified: packages/unstable/hal/debian/rules
===================================================================
--- packages/unstable/hal/debian/rules	2005-08-01 22:02:30 UTC (rev 260)
+++ packages/unstable/hal/debian/rules	2005-08-01 22:36:50 UTC (rev 261)
@@ -26,8 +26,6 @@
 		$(DEB_DESTDIR)/etc/dbus-1/event.d/20hal
 	
 	# helper scripts and settings for when running with dropped priviledges
-	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 \
@@ -35,6 +33,9 @@
 	
 	# /etc/hal/fdi is the preferred configuration location in debian
 	rmdir $(DEB_DESTDIR)/usr/share/hal/fdi/95userpolicy
+	# Don't put links for the helpers in /etc/dev.d and /etc/hotplugd.d 
+	rm -rf $(DEB_DESTDIR)/etc/hotplug.d
+	rm -rf $(DEB_DESTDIR)/etc/dev.d
 
 	# sony_dsc.fdi only causes troubles
 	rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/20freedesktop/sony_dsc.fdi