Changeset 1148

Timestamp:

04/14/09 15:44:36 (3 years ago)

Author:

aj

Message:

Stanislav Brabec:

• Uses HAL_PROP_SMART_CARD_READER_DEVICE_FILE defined in FDI patches above instead of guessing the device node name.
• Restricts access to the group. Requires a change in Makefiles to replace @USER@ and @GROUP@
• Removes deprecated access to /proc/bus/usb.

File:

• trunk/etc/openct.hald.in (modified) (1 diff)

trunk/etc/openct.hald.in

@@ -4 +4 @@
         $HAL_PROP_USB_DEVICE_REVISION_BCD`"
 
-DEVICE="`printf /dev/bus/usb/%03u/%03u \
-        $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`"
+# NOTE: Minor race condidion. udev creates nodes with o+r.
+chmod o-r $HAL_PROP_SMART_CARD_READER_DEVICE_FILE
+chown @USER@:@GROUP@ $HAL_PROP_SMART_CARD_READER_DEVICE_FILE
 
-if test -e $DEVICE
+if test -e "$HAL_PROP_SMART_CARD_READER_DEVICE_FILE"
 then
-        exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE
+        exec @sbindir@/openct-control attach usb:$PRODUCT usb $HAL_PROP_SMART_CARD_READER_DEVICE_FILE
 fi
-
-DEVICE="`printf /proc/bus/usb/%03u/%03u \
-        $HAL_PROP_USB_BUS_NUMBER $HAL_PROP_USB_LINUX_DEVICE_NUMBER`"
-exec @sbindir@/openct-control attach usb:$PRODUCT usb $DEVICE