blob: dd36a4af5785478004583ee911c38332262ba056 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
--- drbd-utils-8.9.1/scripts/block-drbd.orig 2014-07-04 14:23:23.000000000 +0200
+++ drbd-utils-8.9.1/scripts/block-drbd 2015-02-16 02:50:39.257522006 +0100
@@ -251,6 +251,7 @@
case $t in
drbd|phy)
+ p=${p/*dev*drbd*by-res\/} # Clean physical device paths
drbd_resource=$p
drbd_role="$(drbdadm role $drbd_resource)"
drbd_lrole="${drbd_role%%/*}"
@@ -280,12 +281,14 @@
case $t in
drbd|phy)
p=$(xenstore_read "$XENBUS_PATH/params")
+ p=${p/*dev*drbd*by-res\/} # Clean physical device paths
drbd_resource=$p
drbd_role="$(drbdadm role $drbd_resource)"
drbd_lrole="${drbd_role%%/*}"
drbd_dev="$(drbdadm sh-dev $drbd_resource)"
if [ "$drbd_lrole" != 'Secondary' ]; then
+ sleep 1 # Sleep for a second just in case
drbdadm secondary $drbd_resource
fi
exit 0
|
