OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=24

boot.md

@@ -124,6 +124,8 @@ case "$1" in
 			rc_status -u
 		else
 			$mdadm_BIN -A -s -c $mdadm_CONFIG
+			# a status of 2 is not an error
+			test $? -eq 0 -o $? -eq 2
 			rc_status -v
 		fi
 	else
@@ -146,6 +148,8 @@ case "$1" in
 		chmod 0600 /tmp/mdadm.conf
 		if test -s /tmp/mdadm.conf; then
 			mdadm --assemble --scan --config=/tmp/mdadm.conf
+			# a status of 2 is not an error
+			test $? -eq 0 -o $? -eq 2
 			rc_status -v
 		else
 			# no partitions found, "unused"

mdadm.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Dec  5 06:18:44 CET 2008 - nfbrown@suse.de
+
+- boot.md : an exit status of '2' from "mdadm --assemble"
+  should not be seen as failure by boot.md.
+  It happens if one or more arrays is already
+  assembled.
+  (bnc#456028)
+
 -------------------------------------------------------------------
 Thu Nov 20 07:07:06 CET 2008 - nfbrown@suse.de
 

mdadm.spec

@@ -20,7 +20,7 @@
 
 Name:           mdadm
 Version:        3.0
-Release:        10
+Release:        11
 %define ver 3.0-devel2
 BuildRequires:  sgmltool
 PreReq:         %fillup_prereq %insserv_prereq
@@ -160,6 +160,12 @@ rm -rf $RPM_BUILD_ROOT
 /lib/mkinitrd/scripts/boot-md.sh
 
 %changelog
+* Fri Dec 05 2008 nfbrown@suse.de
+- boot.md : an exit status of '2' from "mdadm --assemble"
+  should not be seen as failure by boot.md.
+  It happens if one or more arrays is already
+  assembled.
+  (bnc#456028)
 * Thu Nov 20 2008 nfbrown@suse.de
 - don-t-auto-assemble-if-any-arrays-are-list.patch
   Avoid assembling extra arrays during initrd