73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
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.
|
|
|
|
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
|
|
index 0314d98..84fe5ce 100644
|
|
--- a/WHATS_NEW_DM
|
|
+++ b/WHATS_NEW_DM
|
|
@@ -1,3 +1,6 @@
|
|
+Version 1.02.40 -
|
|
+===================================
|
|
+
|
|
Version 1.02.39 - 26th October 2009
|
|
===================================
|
|
Remove strict default permissions for DM devices from 95-dm-notify.rules.
|
|
diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in
|
|
index 9c2e256..aba0bf4 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 0dd6167..7d1dfcd 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 c6bf23b..72cc609 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"
|