Tue Jul 17 00:01:52 UTC 2012

3 files changed, 45 insertions, 17 deletions

diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index 970a0d180..20b88b329 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 69076 2012-04-08 23:26:43Z seblu $
+# $Id: PKGBUILD 73826 2012-07-16 02:13:49Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=drbd
 pkgver=8.3.11
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 pkgdesc='Userland tools for drbd block devices'
 url='http://www.drbd.org'
 license=('GPL2')
 source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
         "$pkgname.rc"
+        "$pkgname.service"
         '01-remove-old-sanity-check.diff')
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
 md5sums=('e47a35a80143b72e9708844efbe2e608'
-         '6a91609fcd69b435a2a96599f07ad856'
+         '8902a2f7aca6245c27e9566a1509312c'
+         'afbb345094db49b0a474c0b4e51c0acd'
          '24144d23b31f9ce66929fe989247c779')
 
 build() {
   cd $pkgname-$pkgver
   # patch bad sanity check in makefile
-  patch -p1 -i ../01-remove-old-sanity-check.diff
+  patch -p1 -i "$srcdir/01-remove-old-sanity-check.diff"
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
@@ -41,21 +43,28 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  # 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 forced /sbin binaries
+  cd "$pkgdir"
+  mv sbin/* usr/sbin
+  rmdir sbin
+  # fix hardcoded path in udev rules
+  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules
   # move udev files
-  mv "$pkgdir/etc/udev" "$pkgdir/usr/lib"
+  mv etc/udev 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"
+  install -dm 755 usr/share/bash-completion
+  mv etc/bash_completion.d usr/share/bash-completion/completions
   # remove /var/lock
-  rmdir "$pkgdir/var/lock"
+  rmdir var/lock
+  # autoload module
+  install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
+  echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
   # setup initscript (replace)
-  install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  cd "$srcdir"
+  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  # install systemd stuff
+  install -Dm 644 $pkgname.service \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
index 893ce3e20..b8b196e4b 100644
--- a/community/drbd/drbd.rc
+++ b/community/drbd/drbd.rc
@@ -29,9 +29,9 @@ case "$1" in
     check_config
     # load config
     $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
-    # User interruptible version of wait-connect all
+    # user interruptible version of wait-connect all
     $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
-    # Become primary if configured
+    # become primary if configured
     $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
     add_daemon drbd
     stat_done
diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service
new file mode 100644
index 000000000..ddd6c62b7
--- /dev/null
+++ b/community/drbd/drbd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Distributed Replicated Block Device
+After=systemd-modules-load.service network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+
+# load config
+ExecStart=/usr/sbin/drbdadm adjust all
+# user interruptible version of wait-connect all
+ExecStart=/usr/sbin/drbdadm wait-con-int
+# become primary if configured
+ExecStart=/usr/sbin/drbdadm sh-b-pri all
+# disconnect and detach all resources
+ExecStop=/usr/sbin/drbdadm down all
+
+[Install]
+WantedBy=multi-user.target