From 2a7fc8004f198dcf8afe255b50b9c74646499000 Mon Sep 17 00:00:00 2001 Message-Id: <2a7fc8004f198dcf8afe255b50b9c74646499000@dist-git> From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 21 Feb 2014 12:07:03 +0100 Subject: [PATCH] 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 (cherry picked from commit 57e17a74b76fd8f93012d6d0407106e9a2d5c5e3) Signed-off-by: Jiri Denemark --- src/storage/storage_backend_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 556c2cc..1149e43 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -102,7 +102,7 @@ virStorageBackendISCSISession(virStoragePoolObjPtr pool, * Pull out 2nd and 4th fields */ const char *regexes[] = { - "^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+)\\s*$" + "^tcp:\\s+\\[(\\S+)\\]\\s+\\S+\\s+(\\S+).*$" }; int vars[] = { 2, -- 1.9.0