Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

system/drbd-utils: Fix for Xen physical device paths.

Browse source
This commit is contained in:
Mario Preksavec 2015-02-25 12:08:00 +01:00 committed by Willy Sudiarto Raharjo
parent b56f2ce98f
commit 581a45f2a5
2 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
system/drbd-utils/drbd-utils.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for drbd-utils
# Copyright 2014 Mario Preksavec, Zagreb, HR
# Copyright 2014, 2015 Mario Preksavec, Zagreb, Croatia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -24,7 +24,7 @@
PRGNAM=drbd-utils
VERSION=${VERSION:-8.9.1}
BUILD=${BUILD:-2}
BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -69,6 +69,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# This patch allows resources with path: drbd:/dev/drbd/by-res/<resource>
# Xen HVM domains will be able to live migrate with qemu-xen-traditional
patch -p1 <$CWD/patches/xen_handle_physical_device_paths.diff
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \

25
system/drbd-utils/patches/xen_handle_physical_device_paths.diff Normal file
View file

@ -0,0 +1,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