From a73c68d519418e6409737cbaaf42cda5e2dffbf5 Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Wed, 9 Oct 2013 16:28:38 +0200 Subject: [PATCH] Use DM_UDEV_DISABLE_OTHER_RULES_FLAG in rules files Resolves bz1015514 Signed-off-by: Jes Sorensen --- mdadm.rules | 2 +- mdadm.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mdadm.rules b/mdadm.rules index 3083dca..73e9c83 100644 --- a/mdadm.rules +++ b/mdadm.rules @@ -50,7 +50,7 @@ LABEL="md_imsm_inc_end" # Next make sure that this isn't a dm device we should skip for some reason ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="dm_change_end" -ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_change_end" +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="dm_change_end" ENV{DM_SUSPENDED}=="1", GOTO="dm_change_end" KERNEL=="dm-*", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="linux_raid_member", \ ACTION=="change", RUN+="/sbin/mdadm -I $env{DEVNAME}" diff --git a/mdadm.spec b/mdadm.spec index a3be535..27c52e1 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 3.3 -Release: 2%{?dist} +Release: 3%{?dist} Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check @@ -104,6 +104,11 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Wed Oct 9 2013 Jes Sorensen - 3.3-3 +- Check for DM_UDEV_DISABLE_OTHER_RULES_FLAG instead of + DM_UDEV_DISABLE_DISK_RULES_FLAG in 65-md-incremental.rules +- Resolves bz1015521 + * Tue Oct 8 2013 Jes Sorensen - 3.3-2 - Fix dracut requirement, minimum version 034-1