[mdadm/f17: 2/2] Merge branch 'master' into f17

[Jes Sorensen]

commit 2ed7a919610177aba7757fd9c548c4a82c0604ff
Merge: ce149f0 fe785fe
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon Jan 7 11:41:26 2013 +0100

    Merge branch 'master' into f17
    
    Conflicts:
    	mdadm.spec

 mdadm.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc mdadm.spec
index 17d8263,c69a9e4..fa3c821
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -117,21 -117,13 +117,21 @@@ install -m644 %{SOURCE9} %{buildroot}/e
  rm -rf %{buildroot}
  
  %post
 -%systemd_post mdmonitor.service
 +if [ $1 -eq 1 ] ; then
-     /bin/systemctl enable mdmonitor.service >/dev/null
++    /bin/systemctl enable mdmonitor.service >/dev/null 2>&1 || :
 +fi
  
  %preun
 -%systemd_preun mdmonitor.service mdmonitor-takeover.service
 +if [ $1 = 0 ]; then
-     /bin/systemctl --no-reload disable mdmonitor.service
-     /bin/systemctl stop mdmonitor.service > /dev/null
++    /bin/systemctl --no-reload disable mdmonitor.service mdmonitor-takeover.service > /dev/null 2>&1 || :
++    /bin/systemctl stop mdmonitor.service mdmonitor-takeover.service > /dev/null 2>&1 || :
 +fi
  
  %postun
 -%systemd_postun_with_restart mdmonitor.service
 +/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 +if [ $1 -ge 1 ] ; then
 +    /bin/systemctl try-restart mdmonitor.service >/dev/null 2>&1 || :
 +fi
  
  %triggerun --  %{name} < 3.2.2-3
  %{_bindir}/systemd-sysv-convert --save mdmonitor >/dev/null 2>&1 || :