diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
tree | a6464302c970f72581105b50ff0896e1f56def3d /community/drbd | |
parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'community/drbd')
-rw-r--r-- | community/drbd/PKGBUILD | 16 | ||||
-rw-r--r-- | community/drbd/drbd.service | 8 |
2 files changed, 14 insertions, 10 deletions
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index 9c3a09793..bb150a493 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $ +# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $ # Maintainer: Sébastien Luttringer pkgname=drbd pkgver=8.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' @@ -13,16 +13,20 @@ source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$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 @@ package() { 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 diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service index ddd6c62b7..a8053fb05 100644 --- a/community/drbd/drbd.service +++ b/community/drbd/drbd.service @@ -7,13 +7,13 @@ Type=oneshot 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 |