diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-14 10:04:59 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-14 11:01:40 +0000 |
| commit | 6da9c3f6ffb763c72d8d9d809c7a83711de9a3cd (patch) | |
| tree | a9e1a6dc5f2988630afd16e227096f8a88483773 /testing | |
| parent | ca1c0c9e3842b7bf4904e58bdb796097df1d8bee (diff) | |
| download | aports-6da9c3f6ffb763c72d8d9d809c7a83711de9a3cd.tar.bz2 aports-6da9c3f6ffb763c72d8d9d809c7a83711de9a3cd.tar.xz | |
testing/drbd: upgrade to 8.4.3
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/drbd/APKBUILD | 14 | ||||
| -rw-r--r-- | testing/drbd/drbd.initd | 24 |
2 files changed, 19 insertions, 19 deletions
diff --git a/testing/drbd/APKBUILD b/testing/drbd/APKBUILD index 348d906ece..c93527a553 100644 --- a/testing/drbd/APKBUILD +++ b/testing/drbd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=drbd -pkgver=8.4.2 +pkgver=8.4.3 pkgbase=${pkgver%.*} pkgrel=0 pkgdesc="Network-based RAID 1" @@ -55,9 +55,9 @@ pacemaker() { mv "$pkgdir"/usr/lib/ocf "$subpkgdir"/usr/lib } -md5sums="b081f1046adda1d51ba351c40a8b1107 drbd-8.4.2.tar.gz -0b589553e3f3ea54c7f1696582bb49d3 drbd.initd" -sha256sums="f3d86bb5645c067bc61e9461a5d570a184912daedfe6f88623bbd920f8b5b5fa drbd-8.4.2.tar.gz -548b14d6b15c39779f2723e6caf61ee8fce5c18767fb7c940de733c760393ce2 drbd.initd" -sha512sums="c32371e1fb89b479bf5136ee1c00d8e07dd15769654977dfcde71fcc24264c1dae2feda82e8f61b4caf57b9ac88e2861ee7270aa8c867f6245b52d65c45ada46 drbd-8.4.2.tar.gz -9497004b73db57ecb569ced7712937434ef180707fc7c3e822ac5e5dc17fa30f1cef4ce37b2c7439bedb779f9c27c96c0bce6bb61f8ddb3d1045ed3e6e5c38fa drbd.initd" +md5sums="0c54a69603fa28b41de5fb33e03fd9e8 drbd-8.4.3.tar.gz +3a534a80fd82a31c003e9342bfecc496 drbd.initd" +sha256sums="abeb09309b77b533b8e738a601d703b338dce6e4d6cf59741e2f0693fbf94527 drbd-8.4.3.tar.gz +bfccbb5fbf6c0440798dd2b7615831635809cf1fd6e71b7508733408ef4d40cc drbd.initd" +sha512sums="cdc90bdd9491fe6d29e3b779d69ba2aac1aacdb336586f1ef414d0a0195d922dbefa8b2d9c4868a2476998a713c893403344a2934c7768ff6f4ba9f13bb7277a drbd-8.4.3.tar.gz +076baf34332bfd1447b109584145b9ee36b12d065c68d2d100c46ee5affdee6cdd834a1cf26a1e8d0986868fe34d8fe1f10991a3baed010ec642285edbc9be14 drbd.initd" diff --git a/testing/drbd/drbd.initd b/testing/drbd/drbd.initd index d5ce7d8e32..c94c5645c2 100644 --- a/testing/drbd/drbd.initd +++ b/testing/drbd/drbd.initd @@ -30,7 +30,7 @@ fi # redirection. $DRBDADM sh-nop -function assure_module_is_loaded() { +assure_module_is_loaded() { [ -e "$PROC_DRBD" ] && return ebegin "Loading drbd module" ret=0 @@ -40,7 +40,7 @@ function assure_module_is_loaded() { return $ret } -function adjust_with_progress() { +adjust_with_progress() { IFS_O=$IFS NEWLINE=' ' @@ -50,12 +50,12 @@ function adjust_with_progress() { local N=0 einfon "Setting drbd parameters " - COMMANDS=`$DRBDADM -d adjust all` || { + COMMANDS=`$DRBDADM -d adjust all` || { eend 20 "Error executing drbdadm" - return 20 + return 20 } echo -n "[ " - + for CMD in $COMMANDS; do if echo $CMD | grep -q disk; then echo -n "d$D "; D=$(( D+1 )); elif echo $CMD | grep -q syncer; then echo -n "s$S "; S=$(( S+1 )); @@ -64,7 +64,7 @@ function adjust_with_progress() { fi IFS=$IFS_O $CMD || { - echo + echo eend 20 "cmd $CMD failed!" return 20 } @@ -72,7 +72,7 @@ function adjust_with_progress() { done echo "]" eend 0 - + IFS=$IFS_O } @@ -101,7 +101,7 @@ start() { echo sleep 5 - + einfon "Become primary if configured " $DRBDADM sh-b-pri all echo @@ -112,7 +112,7 @@ start() { stop() { ebegin "Stopping all DRBD resources" - + # Check for mounted drbd devices if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then if [ -e ${PROC_DRBD} ]; then @@ -120,8 +120,8 @@ stop() { ret=$? sleep 3 if [ -e /proc/modules ] && grep -q '^drbd' /proc/modules ; then - ${RMMOD} drbd - fi + ${RMMOD} drbd + fi fi eend $ret return $ret @@ -135,7 +135,7 @@ stop() { status() { # NEEDS to be heartbeat friendly... # so: put some "OK" in the output. - + if [ -e $PROC_DRBD ]; then ret=0 ebegin "drbd driver loaded OK; device status:" |