diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2009-11-01 18:01:31 +0000 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2009-11-01 18:01:31 +0000 |
| commit | 06f97f3be32eab935d3d3dd0969d067f557eaab4 (patch) | |
| tree | 8fe006c0ee4896977e373d788691187351df9cc0 /udev | |
| parent | fc7ad9d4c70be812e97efff6b4c64d398bdd3b14 (diff) | |
| download | lvm2-06f97f3be32eab935d3d3dd0969d067f557eaab4.tar.gz lvm2-06f97f3be32eab935d3d3dd0969d067f557eaab4.tar.xz lvm2-06f97f3be32eab935d3d3dd0969d067f557eaab4.zip | |
More cleanup in udev rules:
- add copyright notice for 10-dm.rules.in,
- set DM_UDEV_DISABLE_{DISK, OTHER}_RULES_FLAG in 11-dm-lvm.rules directly
for inappropriate and non-top-level subdevices in case we use older kernels
where DM_COOKIE is not used (and therefore there are no flags passed from
the LVM process itself). This applies for older kernels (version < 2.6.31),
- remove unnecessary filters in 95-dm-notify.rules - the DM_COOKIE env var
itself is set for change/remove udev events and for DM devices only so
there's no need to double-check this.
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/10-dm.rules.in | 4 | ||||
| -rw-r--r-- | udev/11-dm-lvm.rules | 9 | ||||
| -rw-r--r-- | udev/95-dm-notify.rules | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in index 9c2e2568..aba0bf44 100644 --- a/udev/10-dm.rules.in +++ b/udev/10-dm.rules.in @@ -1,3 +1,7 @@ +# Copyright (C) 2009 Red Hat, Inc. All rights reserved. +# +# This file is part of LVM2. + # Udev rules for device-mapper devices. # # These rules create a DM control node in /dev/(DM_DIR) directory. diff --git a/udev/11-dm-lvm.rules b/udev/11-dm-lvm.rules index 0dd6167f..7d1dfcd3 100644 --- a/udev/11-dm-lvm.rules +++ b/udev/11-dm-lvm.rules @@ -22,9 +22,14 @@ ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end" IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup splitname --nameprefixes --noheadings --rows $env{DM_NAME}" # Do not create symlinks for inappropriate subdevices. -ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", GOTO="lvm_end" +ENV{DM_LV_NAME}=="?*_mimage_[0-9]*|pvmove?*|?*_vorigin", GOTO="lvm_disable" +ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable" # Create symlinks for top-level devices only. -ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", ENV{DM_LV_LAYER}!="?*", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}" +ENV{DM_VG_NAME}=="?*", ENV{DM_LV_NAME}=="?*", SYMLINK+="$env{DM_VG_NAME}/$env{DM_LV_NAME}", GOTO="lvm_end" + +LABEL="lvm_disable" +ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}="1" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1" LABEL="lvm_end" diff --git a/udev/95-dm-notify.rules b/udev/95-dm-notify.rules index c6bf23b5..72cc609d 100644 --- a/udev/95-dm-notify.rules +++ b/udev/95-dm-notify.rules @@ -9,10 +9,4 @@ # a cookie value sent within "change" and "remove" events (the cookie # value is set before by that process for every action requested). -SUBSYSTEM!="block", GOTO="dm_end" -KERNEL!="dm-[0-9]*", GOTO="dm_end" -ACTION!="change|remove", GOTO="dm_end" - ENV{DM_COOKIE}=="?*", RUN+="$env{DM_SBIN_PATH}/dmsetup udevcomplete $env{DM_COOKIE}" - -LABEL="dm_end" |