From 223ca251f3ce07eb5484be845e631d6ca645b263 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 10 Apr 2012 00:01:08 +0000
Subject: Tue Apr 10 00:01:08 UTC 2012

---
 community/drbd/PKGBUILD | 29 +++++++++++++++--------------
 community/drbd/drbd.rc  |  4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'community/drbd')

diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index 435047626..970a0d180 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 68283 2012-03-21 09:58:34Z seblu $
+# $Id: PKGBUILD 69076 2012-04-08 23:26:43Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=drbd
 pkgver=8.3.11
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc='Userland tools for drbd block devices'
 url='http://www.drbd.org'
@@ -13,7 +13,7 @@ source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
         '01-remove-old-sanity-check.diff')
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('e47a35a80143b72e9708844efbe2e608'
-         '19236c6fe7a8c9191d67a4df15892b78'
+         '6a91609fcd69b435a2a96599f07ad856'
          '24144d23b31f9ce66929fe989247c779')
 
 build() {
@@ -41,20 +41,21 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  # move udev files to the right place
-  install -d -m 755 "$pkgdir/lib"
-  mv "$pkgdir/etc/udev" "$pkgdir/lib"
-
-  # move bash completion in right place
+  # move forced /sbin binaries and fix harcoded path
+  mv "$pkgdir/sbin"/* "$pkgdir/usr/sbin"
+  rmdir "$pkgdir/sbin"
+  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' \
+    "$pkgdir/etc/udev/rules.d/65-drbd.rules"
+  # move udev files
+  mv "$pkgdir/etc/udev" "$pkgdir/usr/lib"
+  # move bash completion
   install -d -m 755 "$pkgdir/usr/share/bash-completion"
-  mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions"
-
+  mv "$pkgdir/etc/bash_completion.d" \
+    "$pkgdir/usr/share/bash-completion/completions"
   # remove /var/lock
   rmdir "$pkgdir/var/lock"
-
-  # replace 
-  install -D -m 755 "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
+  # setup initscript (replace)
+  install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
index 7aca1f394..893ce3e20 100644
--- a/community/drbd/drbd.rc
+++ b/community/drbd/drbd.rc
@@ -4,7 +4,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-DRBDADM='/sbin/drbdadm'
+DRBDADM='/usr/sbin/drbdadm'
 PROC_DRBD='/proc/drbd'
 
 check_config() {
@@ -50,7 +50,7 @@ case "$1" in
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 
 exit 0
-- 
cgit v1.2.3-54-g00ecf