--- trunk/udev/udev-persistent-storage.rules.magellan	2009/05/23 21:34:50	822
+++ trunk/udev/udev-persistent-storage.rules.magellan	2009/05/23 22:35:53	823
@@ -1,5 +1,5 @@
 # /etc/udev/rules/65-persistent-storage.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-persistent-storage.rules.magellan,v 1.6 2009-04-24 14:19:13 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-persistent-storage.rules.magellan,v 1.7 2009-05-23 22:35:53 niro Exp $
 #
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
@@ -73,10 +73,10 @@
 ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end"
 
 # probe filesystem metadata of optical drives which have a media inserted
-KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT}=="?*", IMPORT{program}="vol_id --export --skip-raid --offset=$env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
+KERNEL=="sr*", ENV{ID_CDROM_MEDIA}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
 
 # probe filesystem metadata of disks
-KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode"
+KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
 
 # watch for future changes
 KERNEL!="sr*", OPTIONS+="watch"