diff options
| author | Richard Yao <ryao@gentoo.org> | 2012-11-17 00:07:04 -0500 |
|---|---|---|
| committer | Richard Yao <ryao@cs.stonybrook.edu> | 2012-11-17 01:07:22 -0500 |
| commit | 151d9085b438a6c6bb50385c99f3f1969620114b (patch) | |
| tree | 87fb21947c510702e71cb6c221c902ac78ccf232 /rules | |
| parent | a91a7609b204ba01037df4ab314dc81c0589c8cb (diff) | |
Eliminate blkid-builtin
Changes to rules were introduced by
7c2dee4a4d7f1b264031daaee786a8fe429884e1 while builtin-blkid support was
introduced in other commits. The removal of systemd resulted in this
code causing linker errors. This code adds complexity with no clear
benefit, so we remove it.
Signed-off-by: Richard Yao <ryao@gentoo.org>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/60-persistent-storage.rules | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index b74821edd4..5ca7c314fc 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -62,14 +62,12 @@ 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{builtin}="blkid --offset=$env{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 -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" # 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{builtin}="blkid --noraid" +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" # probe filesystem metadata of disks -KERNEL!="sr*", IMPORT{builtin}="blkid" +KERNEL!="sr*", IMPORT{program}="@sbindir@/blkid -o udev -p $tempnode" # watch metadata changes by tools closing the device after writing KERNEL!="sr*", OPTIONS+="watch" |