From: Kay Sievers Date: Fri, 13 Feb 2009 15:02:36 +0000 (+0100) Subject: rules: add "watch" option to dm and md rules X-Git-Tag: 174~1167 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=64746532e84c586f7347e0581e6078cefb20044d 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 def184f42..abb029c46 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 bc5d7ea62..15e7ddf75 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 92ab90785..24688c3b1 100644 --- a/udev/udev-watch.c +++ b/udev/udev-watch.c @@ -1,6 +1,7 @@ /* * Copyright (C) 2004-2008 Kay Sievers * Copyright (C) 2009 Canonical Ltd. + * Copyright (C) 2009 Scott James Remnant * * 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