summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-02-11 21:54:43 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-02-11 21:54:43 +0100
commit88ec7bb7543ff9fd15fdce03a1889e7e388a0051 (patch)
tree878965e378cbea54847c234a209014ee4a10212a /rules
parentf24036d63b0aee735c3098d09b9e0ed450e93177 (diff)
rules: move OPTIONS to separate rule
A failing IMPORT+ match would prevent the OPTIONS+= action from being applied.
Diffstat (limited to 'rules')
-rw-r--r--rules/rules.d/60-persistent-storage.rules7
1 files changed, 5 insertions, 2 deletions
diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index 8476f14ecf..532b09b5ec 100644
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -57,8 +57,11 @@ ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_
# 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"
-# probe filesystem metadata of disks, watch for future changes
-KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode", OPTIONS+="watch"
+# probe filesystem metadata of disks
+KERNEL!="sr*", IMPORT{program}="vol_id --export $tempnode"
+
+# watch for future changes
+KERNEL!="sr*", OPTIONS+="watch"
# by-label/by-uuid links (filesystem metadata)
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"