From: Harald Hoyer <harald@redhat.com>
Date: Tue, 5 Feb 2013 09:56:13 +0000 (+0100)
Subject: mdmon: renamed mdmon-offroot@.service to mdmon@.service
X-Git-Tag: 026~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6320d072a138afe7b7150e51240803b52d734ea4;p=thirdparty%2Fdracut.git

mdmon: renamed mdmon-offroot@.service to mdmon@.service
---

diff --git a/dracut.spec b/dracut.spec
index 82ba77297..22f336614 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -96,6 +96,8 @@ Conflicts: initscripts < 8.63-1
 Conflicts: plymouth < 0.8.0-0.2009.29.09.19.1
 %endif
 
+Conflicts: mdadm < 3.2.6-14
+
 %description
 dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
 Unlike existing implementations, dracut does hard-code as little as possible
diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
index 3b5620c4b..3824f406e 100755
--- a/modules.d/90mdraid/module-setup.sh
+++ b/modules.d/90mdraid/module-setup.sh
@@ -88,8 +88,8 @@ install() {
     inst_hook shutdown 30 "$moddir/md-shutdown.sh"
     inst_script "$moddir/mdraid-cleanup.sh" /sbin/mdraid-cleanup
     inst_script "$moddir/mdraid_start.sh" /sbin/mdraid_start
-    if [ -e /lib/systemd/system/mdmon-offroot@.service ]; then
-        inst_simple /lib/systemd/system/mdmon-offroot@.service
+    if [ -e /lib/systemd/system/mdmon@.service ]; then
+        inst_simple /lib/systemd/system/mdmon@.service
     fi
     inst_hook pre-shutdown 30 "$moddir/mdmon-pre-shutdown.sh"
 }