[Usbmount-commit] r29 - in trunk/usbmount: . debian

[Martin Dickopp]

Author: mdickopp-guest
Date: 2005-07-05 20:52:00 +0000 (Tue, 05 Jul 2005)
New Revision: 29

Modified:
   trunk/usbmount/debian/changelog
   trunk/usbmount/debian/control
   trunk/usbmount/usbmount
Log:
Adapt to udev changes: 'udev_volume_id' has been renamed to 'vol_id' and
its output has changed. Depend on udev (>= 0.060-1).


Modified: trunk/usbmount/debian/changelog
===================================================================
--- trunk/usbmount/debian/changelog	2005-07-02 11:10:15 UTC (rev 28)
+++ trunk/usbmount/debian/changelog	2005-07-05 20:52:00 UTC (rev 29)
@@ -1,3 +1,12 @@
+usbmount (0.0.13) unstable; urgency=medium
+
+  * Adapt to udev changes: 'udev_volume_id' has been renamed to
+    'vol_id' and its output has changed (closes: #317022). Depend on
+    udev (>= 0.060-1). Without this change, usbmount doesn't work at
+    all with udev 0.060, therefore urgency=medium.
+
+ --
+
 usbmount (0.0.12) unstable; urgency=low
 
   * Upload sponsored by Rafael Laboissiere.

Modified: trunk/usbmount/debian/control
===================================================================
--- trunk/usbmount/debian/control	2005-07-02 11:10:15 UTC (rev 28)
+++ trunk/usbmount/debian/control	2005-07-05 20:52:00 UTC (rev 29)
@@ -8,7 +8,7 @@
 
 Package: usbmount
 Architecture: all
-Depends: udev (>= 0.053-1), lockfile-progs
+Depends: udev (>= 0.060-1), lockfile-progs
 Description: automatically mount and unmount USB mass storage devices
  This package automatically mounts USB mass storage devices (typically
  USB pens) when they are plugged in, and unmounts them when they are

Modified: trunk/usbmount/usbmount
===================================================================
--- trunk/usbmount/usbmount	2005-07-02 11:10:15 UTC (rev 28)
+++ trunk/usbmount/usbmount	2005-07-05 20:52:00 UTC (rev 29)
@@ -40,9 +40,8 @@
 test -n "$FILESYSTEMS" || { log err "FILESYSTEMS not set"; exit 1; }
 test -n "$MOUNTOPTIONS" || { log err "MOUNTOPTIONS not set"; exit 1; }
 
-# Test if /sbin/udev_volume_id is executable.
-test -x /sbin/udev_volume_id \
-    || { log err "cannnot execute /sbin/udev_volume_id"; exit 1; }
+# Test if /sbin/vol_id is executable.
+test -x /sbin/vol_id || { log err "cannnot execute /sbin/vol_id"; exit 1; }
 
 
 umask 022
@@ -82,13 +81,12 @@
 	fi
 
 	# Test if the device contains a filesystem.  If it doesn't, no
-	# further action is required, but calling udev_volume_id has the
-	# side effect that the partition table is read and partition
-	# devices are created.
-	if /sbin/udev_volume_id "$DEVNAME" | egrep -q '^F:(filesystem|disklabel)$'; then
+	# further action is required, but calling vol_id has the side effect
+	# that the partition table is read and partition devices are created.
+	if /sbin/vol_id "$DEVNAME" | egrep -q '^ID_FS_USAGE=(filesystem|disklabel)$'; then
 	    log debug "$DEVNAME contains a filesystem or disklabel"
 
-	    fstype="`/sbin/udev_volume_id -t \"$DEVNAME\"`"
+	    fstype="`/sbin/vol_id -t \"$DEVNAME\"`"
 	    log debug "$DEVNAME contains filesystem type $fstype"
 
 	    # Test if the filesystem type is in the list of filesystem