rpms/mdadm/devel mdmonitor.init,1.12,1.13

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/mdadm/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29841

Modified Files:
	mdmonitor.init 
Log Message:
* Tue Apr 06 2010 Doug Ledford <dledford at redhat.com> - 3.1.2-7
- Fix up directory in mdmonitor init script so that we restart mdmon like we
  are supposed to
- Add a rule to run incremental assembly on containers in case there are
  multiple volumes in a container and we only started some of them in the
  initramfs
- Make -If work with imsm arrays.  We had too restrictive of a test in
  sysfs_unique_holder.



Index: mdmonitor.init
===================================================================
RCS file: /cvs/extras/rpms/mdadm/devel/mdmonitor.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mdmonitor.init	7 Apr 2010 13:58:54 -0000	1.12
+++ mdmonitor.init	7 Apr 2010 14:51:17 -0000	1.13
@@ -41,11 +41,14 @@ usage ()
 start ()
 {
 # (Re)start mdmon to take over monitoring of mdmon started from the initrd
-    if [ -f /dev/md/*.pid ]; then
-        origprog="$prog"; prog="mdmon"
-        action $"Starting $prog: " /sbin/mdmon --takeover --all
-        prog="$origprog"
-    fi
+    for i in /dev/md/*.pid; do
+	if [ -r $i ]; then
+            origprog="$prog"; prog="mdmon"
+            action $"Starting $prog: " /sbin/mdmon --takeover --all
+            prog="$origprog"
+	    break
+        fi
+    done
 # Make sure configuration file exists and has information we can use
 # MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
     [ -f /etc/mdadm.conf ] || return 6