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

boot.md

@@ -120,9 +120,8 @@ case "$1" in
 		if ! grep -q '^[^#]*[^[:blank:]#]' $mdadm_CONFIG; then
 			# empty /etc/mdadm.conf, "unused"
 			rc_status -u
-		fi
-		if ! $mdadm_BIN -A -s -c $mdadm_CONFIG; then
-			rc_failed 1
+		else
+			$mdadm_BIN -A -s -c $mdadm_CONFIG
 			rc_status -v
 		fi
 	else
@@ -133,14 +132,13 @@ case "$1" in
 		then
 			rc_failed 1
 			rc_status -v
+			chmod 0600 /tmp/mdadm.conf
+			rc_exit
 		fi
 		chmod 0600 /tmp/mdadm.conf
 		if test -s /tmp/mdadm.conf; then
-			if ! mdadm --assemble --scan --config=/tmp/mdadm.conf
-			then
-				rc_failed 1
-				rc_status -v
-			fi
+			mdadm --assemble --scan --config=/tmp/mdadm.conf
+			rc_status -v
 		else
 			# no partitions found, "unused"
 			rc_status -u

mdadm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  4 19:24:54 CET 2008 - mmarek@suse.cz
+
+- correctly display rc_status in boot.md
+
 -------------------------------------------------------------------
 Wed Jan 23 15:55:24 CET 2008 - mmarek@suse.cz
 

mdadm.spec

@@ -12,7 +12,7 @@
 
 Name:           mdadm
 Version:        2.6.4
-Release:        17
+Release:        23
 BuildRequires:  sgmltool
 PreReq:         %fillup_prereq %insserv_prereq
 Obsoletes:      raidtools
@@ -115,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_var}/adm/fillup-templates/sysconfig.mdadm
 
 %changelog
+* Mon Feb 04 2008 mmarek@suse.cz
+- correctly display rc_status in boot.md
 * Wed Jan 23 2008 mmarek@suse.cz
 - fixed auto-assembly part of boot.md
   * if /etc/mdadm.conf is empy or only contains whitespace or