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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-16 14:48:00 -0700 (Tue, 16 Nov 2004)
New Revision: 79

Added:
   packages/hal/trunk/debian/hal.links
   packages/hal/trunk/debian/hal.udev.removable.sh
   packages/hal/trunk/debian/hal.udev.rules
Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/rules
Log:
Add ubuntu's udev configuration

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-16 19:47:55 UTC (rev 78)
+++ packages/hal/trunk/debian/changelog	2004-11-16 21:48:00 UTC (rev 79)
@@ -6,6 +6,8 @@
   * Let hald run as non-root by default
   * Use a dev.d script for lazy device umount. So hald doesn't need too.
     (Script from the ubuntu package)
+  * Install udev configuration to make removable devices owned by group hal
+    (Adapted from the ubuntu package)
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon,  8 Nov 2004 23:59:23 +0100
 

Added: packages/hal/trunk/debian/hal.links
===================================================================
--- packages/hal/trunk/debian/hal.links	2004-11-16 19:47:55 UTC (rev 78)
+++ packages/hal/trunk/debian/hal.links	2004-11-16 21:48:00 UTC (rev 79)
@@ -0,0 +1 @@
+/etc/udev/hal.rules etc/udev/rules.d/z_hal-plugdev.rules

Added: packages/hal/trunk/debian/hal.udev.removable.sh
===================================================================
--- packages/hal/trunk/debian/hal.udev.removable.sh	2004-11-16 19:47:55 UTC (rev 78)
+++ packages/hal/trunk/debian/hal.udev.removable.sh	2004-11-16 21:48:00 UTC (rev 79)
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+# print "1" if device $1 is removable, "0" otherwise.
+# The "removable" attribute appeared in Linux 2.6.8; this script will always
+# print "0" for earlier kernels.
+
+DEV="${1%[0-9]*}"
+REMOVABLE="/sys/block/$DEV/removable"
+
+if [ -e "$REMOVABLE" ]; then
+    cat "$REMOVABLE"
+else
+    echo "0"
+fi
+exit 0

Added: packages/hal/trunk/debian/hal.udev.rules
===================================================================
--- packages/hal/trunk/debian/hal.udev.rules	2004-11-16 19:47:55 UTC (rev 78)
+++ packages/hal/trunk/debian/hal.udev.rules	2004-11-16 21:48:00 UTC (rev 79)
@@ -0,0 +1,4 @@
+# put removable IDE/SCSI devices into the hal group instead of 'disk'
+BUS="scsi",KERNEL="sd[a-z]*", PROGRAM="/etc/udev/scripts/removable.sh %k", RESULT="1", NAME="%k", MODE="0640", GROUP="hal"
+BUS="ide", KERNEL="hd[a-z]*", PROGRAM="/etc/udev/scripts/removable.sh %k", RESULT="1", NAME="%k", MODE="0640", GROUP="hal"
+BUS="usb", KERNEL="ub[a-z]*", PROGRAM="/etc/udev/scripts/removable.sh %k", RESULT="1", NAME="%k", MODE="0640", GROUP="hal"

Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules	2004-11-16 19:47:55 UTC (rev 78)
+++ packages/hal/trunk/debian/rules	2004-11-16 21:48:00 UTC (rev 79)
@@ -21,6 +21,11 @@
 	install -d $(DEB_DESTDIR)/etc/dbus-1/event.d
 	install -m 755 debian/hal.init.dbus \
 		$(DEB_DESTDIR)/etc/dbus-1/event.d/20hal
-	rmdir $(DEB_DESTDIR)/usr/share/hal/fdi/95userpolicy
+	
+	# helper scripts and settings for when running 
 	install -m 755 -D debian/unmount.dev \
 		$(DEB_DESTDIR)/etc/dev.d/default/unmount.dev
+	install -m 755 -D debian/hal.udev.device-removable.sh \
+	  $(DEB_DESTDIR)/etc/udev/scripts/removable.sh
+	install -m 644 -D debian/hal.udev.rules \
+	  $(DEB_DESTDIR)/etc/udev/hal.rules