diff -Nru usbmount-0.0.17ubuntu1/debian/changelog usbmount-0.0.17ubuntu1.1/debian/changelog --- usbmount-0.0.17ubuntu1/debian/changelog 2009-05-08 08:37:19.000000000 -0400 +++ usbmount-0.0.17ubuntu1.1/debian/changelog 2010-03-03 12:14:36.000000000 -0500 @@ -1,3 +1,10 @@ +usbmount (0.0.17ubuntu1.1) karmic-proposed; urgency=low + + * SRU: Use '/sbin/blkid' instead of '/lib/udev/vol_id', which is not + present in udev anymore. (LP: #478487, LP: #530972) + + -- Andres Rodriguez Wed, 03 Mar 2010 12:14:32 -0500 + usbmount (0.0.17ubuntu1) karmic; urgency=low * Merge from debian unstable (LP: #373391), remaining changes: diff -Nru usbmount-0.0.17ubuntu1/usbmount usbmount-0.0.17ubuntu1.1/usbmount --- usbmount-0.0.17ubuntu1/usbmount 2009-05-01 00:22:07.000000000 -0400 +++ usbmount-0.0.17ubuntu1.1/usbmount 2010-03-03 12:13:34.000000000 -0500 @@ -37,8 +37,11 @@ } -# Test if /lib/udev/vol_id is executable. -test -x /lib/udev/vol_id || { log err "cannnot execute /lib/udev/vol_id"; exit 1; } +# Test if blkid is executable. +if [ ! -x /sbin/blkid ]; then + log err "cannot execute /sbin/blkid" + exit 1 +fi # Default values for configuration variables. ENABLED=1 @@ -104,12 +107,11 @@ mount "$DEVNAME" # Test if the device contains a filesystem. If it doesn't, no - # further action is required, but calling vol_id has the side effect - # that the partition table is read and partition devices are created. - elif /lib/udev/vol_id "$DEVNAME" | egrep -q '^ID_FS_USAGE=(filesystem|disklabel)$'; then + # further action is required. + elif /sbin/blkid -p -o udev "$DEVNAME" | egrep -q '^ID_FS_USAGE=(filesystem|disklabel)$'; then log debug "$DEVNAME contains a filesystem or disklabel" - fstype="`/lib/udev/vol_id -t \"$DEVNAME\"`" + fstype="`/sbin/blkid -s TYPE -o value \"$DEVNAME\"`" log debug "$DEVNAME contains filesystem type $fstype" # Test if the filesystem type is in the list of filesystem