32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
|
From 9273b83edf6ee72a59511f307e168813ca3d31fd Mon Sep 17 00:00:00 2001
|
||
|
|
From: colttt <shadow_7@gmx.net>
|
||
|
|
Date: Fri, 12 Oct 2018 15:29:48 +0200
|
||
|
|
Subject: [PATCH] possible fix for #1026
|
||
|
|
|
||
|
|
add an if-condition and remove an useless 'targetcli create'
|
||
|
|
---
|
||
|
|
heartbeat/iSCSITarget.in | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/heartbeat/iSCSITarget.in b/heartbeat/iSCSITarget.in
|
||
|
|
index e49a79016..9128fdc55 100644
|
||
|
|
--- a/heartbeat/iSCSITarget.in
|
||
|
|
+++ b/heartbeat/iSCSITarget.in
|
||
|
|
@@ -340,13 +340,13 @@ iSCSITarget_start() {
|
||
|
|
ocf_take_lock $TARGETLOCKFILE
|
||
|
|
ocf_release_lock_on_exit $TARGETLOCKFILE
|
||
|
|
ocf_run targetcli /iscsi set global auto_add_default_portal=false || exit $OCF_ERR_GENERIC
|
||
|
|
- ocf_run targetcli /iscsi create ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
|
||
|
|
+ if ! [ -d /sys/kernel/config/target/iscsi/${OCF_RESKEY_iqn} ] ; then
|
||
|
|
+ ocf_run targetcli /iscsi create ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
|
||
|
|
+ fi
|
||
|
|
for portal in ${OCF_RESKEY_portals}; do
|
||
|
|
if [ $portal != ${OCF_RESKEY_portals_default} ] ; then
|
||
|
|
IFS=':' read -a sep_portal <<< "$portal"
|
||
|
|
ocf_run targetcli /iscsi/${OCF_RESKEY_iqn}/tpg1/portals create "${sep_portal[0]}" "${sep_portal[1]}" || exit $OCF_ERR_GENERIC
|
||
|
|
- else
|
||
|
|
- ocf_run targetcli /iscsi create ${OCF_RESKEY_iqn} || exit $OCF_ERR_GENERIC
|
||
|
|
fi
|
||
|
|
done
|
||
|
|
# in lio, we can set target parameters by manipulating
|