From 77a57d5eafc3e46d01b196312d5dd4f28e0e8010 Mon Sep 17 00:00:00 2001

From: Harald Hoyer <harald@redhat.com>

Date: Tue, 4 Oct 2011 13:03:45 +0200

Subject: [PATCH] order mdadm and lvm timeout operations

---

 modules.d/90lvm/64-lvm.rules                    |    2 +-

 modules.d/90mdraid/65-md-incremental-imsm.rules |    2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules.d/90lvm/64-lvm.rules b/modules.d/90lvm/64-lvm.rules

index 487d08a..ab827a9 100644

--- a/modules.d/90lvm/64-lvm.rules

+++ b/modules.d/90lvm/64-lvm.rules

@@ -13,7 +13,7 @@ PROGRAM=="/bin/sh -c 'for i in $sys/$devpath/holders/dm-[0-9]*; do [ -e $$i ] &&

     GOTO="lvm_end"

 RUN+="/sbin/initqueue --settled --onetime --unique /sbin/lvm_scan"

-RUN+="/sbin/initqueue --timeout --onetime --unique /sbin/lvm_scan --partial"

+RUN+="/sbin/initqueue --timeout --name 51-lvm_scan --onetime --unique /sbin/lvm_scan --partial"

 RUN+="/bin/sh -c '>/tmp/.lvm_scan-%k;'"

 LABEL="lvm_end"

diff --git a/modules.d/90mdraid/65-md-incremental-imsm.rules b/modules.d/90mdraid/65-md-incremental-imsm.rules

index 2a80700..139a599 100644

--- a/modules.d/90mdraid/65-md-incremental-imsm.rules

+++ b/modules.d/90mdraid/65-md-incremental-imsm.rules

@@ -27,7 +27,7 @@ PROGRAM="/bin/sh -c 'for i in $sys/$devpath/holders/md[0-9_]*; do [ -e $$i ] &&

 ENV{DEVTYPE}!="partition", \

     RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}"

-RUN+="/sbin/initqueue --timeout --onetime --unique /sbin/mdraid_start"

+RUN+="/sbin/initqueue --timeout --name 50-mdraid_start --onetime --unique /sbin/mdraid_start"

 # if rd_MDADMCONF is set, do not assemble incrementally;

 # defer conf-based assembly until the udev queue is settled