summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-02-13 16:02:36 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-02-13 16:02:36 +0100
commit64746532e84c586f7347e0581e6078cefb20044d (patch)
tree8b572836ef61e00c15b7e91e819929ca501c9a7d
parent4aca304e48d69766d47439f0d3dcaa8797b46c78 (diff)
rules: add "watch" option to dm and md rules
-rw-r--r--rules/packages/64-md-raid.rules1
-rw-r--r--rules/suse/64-device-mapper.rules1
-rw-r--r--udev/udev-watch.c1
3 files changed, 3 insertions, 0 deletions
diff --git a/rules/packages/64-md-raid.rules b/rules/packages/64-md-raid.rules
index def184f42c..abb029c46f 100644
--- a/rules/packages/64-md-raid.rules
+++ b/rules/packages/64-md-raid.rules
@@ -26,6 +26,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNA
IMPORT{program}="vol_id --export $tempnode"
OPTIONS+="link_priority=100"
+OPTIONS+="watch"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
diff --git a/rules/suse/64-device-mapper.rules b/rules/suse/64-device-mapper.rules
index bc5d7ea629..15e7ddf755 100644
--- a/rules/suse/64-device-mapper.rules
+++ b/rules/suse/64-device-mapper.rules
@@ -16,6 +16,7 @@ ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
IMPORT{program}="vol_id --export $tempnode"
OPTIONS+="link_priority=-100"
+OPTIONS+="watch"
ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
diff --git a/udev/udev-watch.c b/udev/udev-watch.c
index 92ab907856..24688c3b19 100644
--- a/udev/udev-watch.c
+++ b/udev/udev-watch.c
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2009 Canonical Ltd.
+ * Copyright (C) 2009 Scott James Remnant <scott@netsplit.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by