rules: add "watch" option to dm and md rules

diff --git a/rules/packages/64-md-raid.rules b/rules/packages/64-md-raid.rules
index def184f42c224ef04a7f5eb32398c3561e5fa265..abb029c46f5c3ae9573f5c3c30acb6ae1f3f6eea 100644 (file)
--- 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 bc5d7ea629dda195456c953027adf19f69eb2ec7..15e7ddf75555bf37409f03cbc1de05be0f8f3f71 100644 (file)
--- 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 92ab90785602db9d63dd93f147ddcce9391e58b1..24688c3b19e690b42a9a8d790de6cb3eb048c29a 100644 (file)
--- 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