From 6dab112ae74c7d6995761e4da0cd891166f927fd Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Thu, 13 Nov 2014 18:21:22 +0000
Subject: [PATCH] fix mdadm

---
 .gitignore               | 24 ++++++++++++++----------
 mdadm/PKGBUILD           | 10 +++++-----
 mdadm/mdadm.service      |  2 +-
 mdadm/mdadm_hook         |  2 +-
 mdadm/mdadm_install      |  2 +-
 mdadm/mdadm_udev_install |  2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b79f4c84..c4e9a2dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,17 @@ src
 dbg
 hdr
 *~
+
+build-desktop.sh
 build.sh
+check-database.sh
+check-links.sh
+check-so-files.sh
 clean-builddir.sh
-clean-workdir.sh
 clean-database.sh
-copy.sh
+clean-workdir.sh
 copy-any.sh
+fakeuname
 get-any.sh
 makepkg
 move.sh
@@ -21,19 +26,18 @@ pkgrels-increase.sh
 pkgrels-reset.sh
 rebuildlist-build.sh
 rebuildlist-generate.sh
+recreate-database.sh
+remove.sh
 repoclean-local.sh
 repoclean-remote.sh
 show-config.sh
 show-pkglists.sh
-sync-complete.sh
-sync-down.sh
-sync-up-nodb.sh
-sync-up.sh
-remove.sh
-recreate-database.sh
-upload.sh
-upload-nodb.sh
+sign-remote-db.sh
+sign-remote-pkg.sh
 unlock-database.sh
+upload-nodb.sh
+upload.sh
+
 
 *-cfg.conf
 *-makepkg.conf
diff --git a/mdadm/PKGBUILD b/mdadm/PKGBUILD
index 459fe6564..9f0d4a59c 100644
--- a/mdadm/PKGBUILD
+++ b/mdadm/PKGBUILD
@@ -3,7 +3,7 @@
 #
 pkgname=mdadm
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(x86_64)
 license=('GPL')
@@ -22,10 +22,10 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.xz
 replaces=('raidtools')
 md5sums=('4227d48de62dfb217c92fa0c54171bbe'
          '5a37c112aa07dccdde62f9fa5b888607'
-         'af2f73f0094ebee66f503ca4710c7142'
-         'fbfb7d07efcbaf5dc61af424c5f6e352'
-         'b6b0bfd6487c99264578630616dfe5eb'
-         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '1c13620a503cad264b869ff27f00e5c6'
+         'e7bb7410a435045b238c2fa4ae38021e'
+         'f2fc02195288251b42b4ccacacf42307'
+         '3e98495cd8dc8fceb442be8e9c397a1a'
          '599745ed2bec4489e83991cff89c46ee')
 
 prepare() {
diff --git a/mdadm/mdadm.service b/mdadm/mdadm.service
index b3ca5f7a7..c49faf4bd 100644
--- a/mdadm/mdadm.service
+++ b/mdadm/mdadm.service
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/usr/bin/mdadm --monitor --scan
+ExecStart=/usr/sbin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mdadm/mdadm_hook b/mdadm/mdadm_hook
index 5371baaca..cd47038c8 100755
--- a/mdadm/mdadm_hook
+++ b/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /usr/bin/mdassemble
+    [ -s "$mdconfig" ] && /usr/sbin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/mdadm/mdadm_install b/mdadm/mdadm_install
index 7390509fa..af63cc41f 100644
--- a/mdadm/mdadm_install
+++ b/mdadm/mdadm_install
@@ -8,7 +8,7 @@ build() {
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/usr/bin/mdassemble"
+    add_binary "/usr/sbin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript
diff --git a/mdadm/mdadm_udev_install b/mdadm/mdadm_udev_install
index c01cbaf24..b8d55d744 100644
--- a/mdadm/mdadm_udev_install
+++ b/mdadm/mdadm_udev_install
@@ -9,7 +9,7 @@ build() {
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "/usr/bin/mdadm"
+    add_binary "/usr/sbin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }