summaryrefslogtreecommitdiff
path: root/rules/60-persistent-storage.rules
diff options
context:
space:
mode:
authorRichard Yao <ryao@cs.stonybrook.edu>2012-11-19 09:44:21 -0500
committerRichard Yao <ryao@cs.stonybrook.edu>2012-11-19 11:09:29 -0500
commit31040610c959a9f12d0df9f28fa3566fc0bc5fe4 (patch)
treedc387e373e8312ebcbde09eeccd603e42f651343 /rules/60-persistent-storage.rules
parent54f8992ab9ebe04e79f752ed0ac45c06e49ff407 (diff)
Reintroduce blkid-builtin
The build failure that prompted its removal has been resolved. Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'rules/60-persistent-storage.rules')
-rw-r--r--rules/60-persistent-storage.rules8
1 files changed, 5 insertions, 3 deletions
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 5ca7c314fc..b74821edd4 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -62,12 +62,14 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA
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{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="@sbindir@/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode"
+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", \
+ IMPORT{builtin}="blkid --offset=$env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}"
# single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET
-KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="@sbindir@/blkid -o udev -p -u noraid $tempnode"
+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", \
+ IMPORT{builtin}="blkid --noraid"
# probe filesystem metadata of disks
-KERNEL!="sr*", IMPORT{program}="@sbindir@/blkid -o udev -p $tempnode"
+KERNEL!="sr*", IMPORT{builtin}="blkid"
# watch metadata changes by tools closing the device after writing
KERNEL!="sr*", OPTIONS+="watch"