Hello community, here is the log from the commit of package mdadm checked in at Mon Feb 4 21:59:20 CET 2008. -------- --- mdadm/mdadm.changes 2008-01-24 16:44:06.000000000 +0100 +++ mdadm/mdadm.changes 2008-02-04 19:26:32.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 4 19:24:54 CET 2008 - mmarek@suse.cz + +- correctly display rc_status in boot.md + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.a25843/_old 2008-02-04 21:58:51.000000000 +0100 +++ /var/tmp/diff_new_pack.a25843/_new 2008-02-04 21:58:51.000000000 +0100 @@ -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 @@ %{_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 ++++++ boot.md ++++++ --- mdadm/boot.md 2008-01-24 16:51:58.000000000 +0100 +++ mdadm/boot.md 2008-02-04 19:22:21.000000000 +0100 @@ -120,9 +120,8 @@ 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 @@ 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org