|
 |
9abf8c |
From b76aac712f822e75951b10f516c99c573b89e4fe Mon Sep 17 00:00:00 2001
|
|
|
9abf8c |
From: David Tardon <dtardon@redhat.com>
|
|
|
9abf8c |
Date: Tue, 4 Aug 2020 14:18:54 +0200
|
|
|
9abf8c |
Subject: [PATCH] match simplified rd.zfcp format too
|
|
|
9abf8c |
|
|
|
9abf8c |
The simplified format was introduced by commit
|
|
|
9abf8c |
c8aa1d949aecaf146b0a0e1ce269f69e6048dc5a .
|
|
|
9abf8c |
|
|
|
9abf8c |
(cherry picked from commit d9e27b091717a1ce1c58cc911d9d7b5ec3ed901e)
|
|
|
9abf8c |
|
|
|
9abf8c |
Resolves: #1552619
|
|
|
9abf8c |
---
|
|
|
9abf8c |
modules.d/95zfcp/parse-zfcp.sh | 2 +-
|
|
|
9abf8c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9abf8c |
|
|
|
9abf8c |
diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh
|
|
|
9abf8c |
index fb4d9c9e..5aa6add8 100755
|
|
|
9abf8c |
--- a/modules.d/95zfcp/parse-zfcp.sh
|
|
|
9abf8c |
+++ b/modules.d/95zfcp/parse-zfcp.sh
|
|
|
9abf8c |
@@ -3,7 +3,7 @@
|
|
|
9abf8c |
getargbool 1 rd.zfcp.conf -d -n rd_NO_ZFCPCONF || rm /etc/zfcp.conf
|
|
|
9abf8c |
|
|
|
9abf8c |
for zfcp_arg in $(getargs rd.zfcp -d 'rd_ZFCP='); do
|
|
|
9abf8c |
- echo $zfcp_arg | grep '^0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\},0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}$' >/dev/null
|
|
|
9abf8c |
+ echo $zfcp_arg | grep '^0\.[0-9a-fA-F]\.[0-9a-fA-F]\{4\}\(,0x[0-9a-fA-F]\{16\},0x[0-9a-fA-F]\{16\}\)\?$' >/dev/null
|
|
|
9abf8c |
test $? -ne 0 && die "For argument 'rd.zfcp=$zfcp_arg'\nSorry, invalid format."
|
|
|
9abf8c |
(
|
|
|
9abf8c |
IFS=","
|
|
|
9abf8c |
|