From f89e46bc12daeb75343e8025fe10f0e099ac27aa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Jan 2010 10:37:58 +0000
Subject: [PATCH] * Revert r19339 because it doesn't work and gives a lot of
 errors:

client# /dev/fd/9: line 13: -q: command not found
client# /dev/fd/9: line 18: test: -neq: binary operator expected
client# mdadm: No arrays found in config file

svn path=/nixos/trunk/; revision=19386
---
 modules/tasks/swraid.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index ca37b716c625..dfdb9e9a34d5 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -5,7 +5,6 @@
 let
 
   tempConf = "/var/run/mdadm.conf";
-  tempStatus = "/var/run/mdadm.status";
   logFile = "/var/log/mdadmEvents.log";
   modprobe = config.system.sbin.modprobe;
   inherit (pkgs) mdadm diffutils;
@@ -43,21 +42,9 @@ in
       # Scan /proc/partitions for RAID devices.
       ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
 
-      if ! -q ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
-        
-        try=0
-        while ! test -e /proc/mdstat || ! ${diffutils}/bin/diff -q /proc/mdstat ${tempStatus} > /dev/null; do
-          test $try -gt 6 && break
-          test $try -neq 0 && sleep 10
-
-          # Activate each device found.
-          ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
-
-          try=$(($try + 1))
-        done
-
-        # Register the new status
-        cp /proc/mdstat ${tempStatus}
+      if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
+        # Activate each device found.
+        ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan
 
         # Send notifications.
         initctl emit -n new-devices
@@ -77,7 +64,6 @@ in
 
     postStart = ''
       echo > ${tempConf}
-      echo > ${tempStatus}
 
       # Assemble early raid devices.
       initctl emit -n new-raid-array