From e81f9da38494955169b4273b5f05b3fa691fc867 Mon Sep 17 00:00:00 2001
From: zrlang <zrlang@rd103.in.linx>
Date: Fri, 10 Sep 2010 09:10:21 +0800
Subject: [PATCH] 	Second modify for old stopped raid

---
 operation/mkraid.sh     | 6 +++---
 operation/mkraidconf.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/operation/mkraid.sh b/operation/mkraid.sh
index 5ed5399..3d763fc 100755
--- a/operation/mkraid.sh
+++ b/operation/mkraid.sh
@@ -128,7 +128,7 @@ setArgument(){
 testBeforeMkraid(){
 	local i
 	#test the "(3) mdX has exist" error
-	mdadm -Q $RAIDNAME >>${LOGDIR}${LOGFILE} 2>>${LOGDIR}${LOGFILE} 
+	mdadm -D $RAIDNAME >>${LOGDIR}${LOGFILE} 2>>${LOGDIR}${LOGFILE} 
 	if [ $? == "0" ]; then
 		ERRNO="3"
 		return 1
@@ -164,8 +164,8 @@ testBeforeMkraid(){
 	#      used"
 	for i in $DEVICELIST
 	do
-		mdadm -E $i >>${LOGDIR}${LOGFILE} 2>>${LOGDIR}${LOGFILE}
-		if [ $? == "0" ]; then
+		if [ mdadm -Ds -v | grep $i ];then # >>${LOGDIR}${LOGFILE} 2>>${LOGDIR}${LOGFILE}
+#		if [ $? == "0" ]; then
 			ERRNO="6"
 			return 1
 		fi
diff --git a/operation/mkraidconf.sh b/operation/mkraidconf.sh
index b349841..b20ec66 100755
--- a/operation/mkraidconf.sh
+++ b/operation/mkraidconf.sh
@@ -29,5 +29,5 @@ if [ ! -d $CONDIR ]; then
 		exit 1
 	fi
 fi
-mdadm -Es -v > $CONDIR$CONFILE
+mdadm -Ds -v > $CONDIR$CONFILE