Commit 61e4eecf authored by Mike Hibler's avatar Mike Hibler

Fix the previous fix that was both unambiguous and wrong.

With it, iSCSI blockstores on Ubuntu16 and CentOS would not work.
parent 1087d5aa
......@@ -994,7 +994,7 @@ sub os_check_storage_element($$)
my $session;
@lines = `$ISCSI -m session 2>&1`;
foreach (@lines) {
if (/^tcp: \[(\d+)\].*$uuid *$/) {
if (/^tcp: \[(\d+)\].*$uuid\b/) {
$session = $1;
last;
}
......@@ -1505,9 +1505,11 @@ sub os_create_storage_element($$$)
#
# Make sure we are connected
#
my $session;
@lines = `$ISCSI -m session 2>&1`;
foreach (@lines) {
if (/^tcp: \[(\d+)\].*$uuid *$/) {
chomp;
if (/^tcp: \[(\d+)\].*$uuid\b/) {
$session = $1;
last;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment