[arch-commits] Commit in drbd/trunk (PKGBUILD drbd.service)

[Sébastien Luttringer]

    Date: Monday, May 13, 2013 @ 01:26:18
  Author: seblu
Revision: 90498

upgpkg: drbd 8.4.2-2

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

Modified:
  drbd/trunk/PKGBUILD
  drbd/trunk/drbd.service

--------------+
 PKGBUILD     |   14 +++++++++-----
 drbd.service |    8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 23:11:39 UTC (rev 90497)
+++ PKGBUILD	2013-05-12 23:26:18 UTC (rev 90498)
@@ -3,7 +3,7 @@
 
 pkgname=drbd
 pkgver=8.4.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
@@ -13,16 +13,20 @@
         "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('b081f1046adda1d51ba351c40a8b1107'
-         'afbb345094db49b0a474c0b4e51c0acd')
+         '7dc909b5895c0b5289d3ee0581d7d333')
 
+prepare() {
+  # fix hardcoded path in udev rules
+  sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules
+}
+
 build() {
   cd $pkgname-$pkgver
-  # fix hardcoded path in udev rules
-  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
     --sysconfdir=/etc \
+    --sbindir=/usr/bin \
     --with-distro=generic \
     --with-utils \
     --with-bashcompletion \
@@ -41,7 +45,7 @@
   make DESTDIR="$pkgdir" install
   # move forced /sbin binaries
   cd "$pkgdir"
-  mv sbin/* usr/sbin
+  mv sbin/* usr/bin
   rmdir sbin
   # move udev files
   mv etc/udev usr/lib

Modified: drbd.service
===================================================================
--- drbd.service	2013-05-12 23:11:39 UTC (rev 90497)
+++ drbd.service	2013-05-12 23:26:18 UTC (rev 90498)
@@ -7,13 +7,13 @@
 RemainAfterExit=yes
 
 # load config
-ExecStart=/usr/sbin/drbdadm adjust all
+ExecStart=/usr/bin/drbdadm adjust all
 # user interruptible version of wait-connect all
-ExecStart=/usr/sbin/drbdadm wait-con-int
+ExecStart=/usr/bin/drbdadm wait-con-int
 # become primary if configured
-ExecStart=/usr/sbin/drbdadm sh-b-pri all
+ExecStart=/usr/bin/drbdadm sh-b-pri all
 # disconnect and detach all resources
-ExecStop=/usr/sbin/drbdadm down all
+ExecStop=/usr/bin/drbdadm down all
 
 [Install]
 WantedBy=multi-user.target