]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
match simplified rd.zfcp format too
authorDavid Tardon <dtardon@redhat.com>
Tue, 4 Aug 2020 12:18:54 +0000 (14:18 +0200)
committerDaniel Molkentin <daniel@molkentin.de>
Tue, 4 Aug 2020 14:27:48 +0000 (16:27 +0200)
The simplified format was introduced by commit
c8aa1d949aecaf146b0a0e1ce269f69e6048dc5a .

modules.d/95zfcp/parse-zfcp.sh

index fb4d9c9e00fb1f8f0aec0b8e315042b37327a002..5aa6add87ca29e5e77bf003464e26c4c72e3ef30 100755 (executable)
@@ -3,7 +3,7 @@
 getargbool 1 rd.zfcp.conf -d -n rd_NO_ZFCPCONF || rm /etc/zfcp.conf
 
 for zfcp_arg in $(getargs rd.zfcp -d 'rd_ZFCP='); do
-    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
+    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
     test $? -ne 0 && die "For argument 'rd.zfcp=$zfcp_arg'\nSorry, invalid format."
     (
         IFS=","