1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 01:34:11 +03:00

Ignore additional fields in iscsiadm output

There has been a new field introduced in iscsiadm --mode session
output [1], but our regex only expects four fields. This breaks
startup of iscsi pools:
error: Failed to start pool iscsi
error: internal error: cannot find session

Fix this by ignoring anything after the fourth field.

https://bugzilla.redhat.com/show_bug.cgi?id=1067173

[1] https://github.com/mikechristie/open-iscsi/commit/181af9a
This commit is contained in:
Ján Tomko 2014-02-21 10:22:22 +01:00
parent abf1daf0d7
commit 57e17a74b7

View File

@ -102,7 +102,7 @@ virStorageBackendISCSISession(virStoragePoolObjPtr pool,
* Pull out 2nd and 4th fields * Pull out 2nd and 4th fields
*/ */
const char *regexes[] = { const char *regexes[] = {
"^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+)\\s*$" "^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+).*$"
}; };
int vars[] = { int vars[] = {
2, 2,