diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-23 03:21:53 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-23 03:21:53 +0100 |
| commit | 7c2dee4a4d7f1b264031daaee786a8fe429884e1 (patch) | |
| tree | 5b060bb323bbd109ec096fe3cf61fc7dd15ad027 | |
| parent | c38a141b1f66ef48f8e4f71e26d1861de63bd151 (diff) | |
rules: switch to built-in blkid
| -rw-r--r-- | rules/rules.d/60-persistent-storage.rules.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/rules/rules.d/60-persistent-storage.rules.in b/rules/rules.d/60-persistent-storage.rules.in index 47185386cd..9b340334f4 100644 --- a/rules/rules.d/60-persistent-storage.rules.in +++ b/rules/rules.d/60-persistent-storage.rules.in @@ -66,12 +66,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" |