diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
tree | 0f63651432b8448262549265a5420fff1ab665e8 /community/drbd/drbd.rc | |
parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'community/drbd/drbd.rc')
-rw-r--r-- | community/drbd/drbd.rc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |