Fabio Erculiani
d8ac392c14
This ebuilds add support for building external libiscsi, useful for our Anaconda installer. DO NOT override this overlay version if libiscsi support hasn't been merged upstream yet.
32 lines
798 B
Diff
32 lines
798 B
Diff
--- utils.orig/iscsi_discovery 2009-10-26 23:09:08.000000000 +0100
|
|
+++ utils/iscsi_discovery 2009-10-26 23:11:56.000000000 +0100
|
|
@@ -104,24 +104,22 @@
|
|
|
|
connected=0
|
|
discovered=0
|
|
- df=/tmp/discovered.$$
|
|
|
|
dbg "starting discovery to $ip"
|
|
- iscsiadm -m discovery --type sendtargets --portal ${ip}:${port} > ${df}
|
|
- while read portal target
|
|
+ disc="$(iscsiadm -m discovery --type sendtargets --portal ${ip}:${port})"
|
|
+ echo "${disc}" | while read portal target
|
|
do
|
|
portal=${portal%,*}
|
|
select_transport
|
|
- done < ${df}
|
|
+ done
|
|
|
|
- discovered=$(cat ${df} | wc -l)
|
|
+ discovered=$(echo "${disc}" | wc -l)
|
|
if [ ${discovered} = 0 ]; then
|
|
echo "failed to discover targets at ${ip}"
|
|
exit 2
|
|
else
|
|
echo "discovered ${discovered} targets at ${ip}"
|
|
fi
|
|
- /bin/rm -f ${df}
|
|
}
|
|
|
|
try_login()
|