chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c38a141
)
rules: switch to built-in blkid
author
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 23 Dec 2011 02:21:53 +0000
(
03:21
+0100)
committer
Kay Sievers
<kay.sievers@vrfy.org>
Fri, 23 Dec 2011 02:21:53 +0000
(
03:21
+0100)
rules/rules.d/60-persistent-storage.rules.in
patch
|
blob
|
history
diff --git
a/rules/rules.d/60-persistent-storage.rules.in
b/rules/rules.d/60-persistent-storage.rules.in
index 47185386cdf0487046851a6e4f91e6c99169bd85..9b340334f422f517ab59fc2a60a32408e2bb7d22 100644
(file)
--- 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
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
# 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
# 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"
# watch metadata changes by tools closing the device after writing
KERNEL!="sr*", OPTIONS+="watch"