From f14b1e323b66458d17c60cdfa4f81bc55bf6c37f Mon Sep 17 00:00:00 2001
From: hongjinghao <hongjinghao@huawei.com>
Date: Thu, 13 Jun 2024 14:14:56 +0800
Subject: [PATCH] backport update stream

(cherry picked from commit fcda6c6d06b7f5b98775057940f899e231d0675a)
---
 ...orrect-shellcheck-regression-when-pa.patch | 31 +++++++++++++++++++
 dracut.spec                                   |  6 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch

diff --git a/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch b/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch
new file mode 100644
index 0000000..1667c5d
--- /dev/null
+++ b/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch
@@ -0,0 +1,31 @@
+From 5d2bda46f4e75e85445ee4d3bd3f68bf966287b9 Mon Sep 17 00:00:00 2001
+From: Ihno Krumreich <ihno@suse.com>
+Date: Wed, 28 Feb 2024 08:24:35 +0100
+Subject: [PATCH] fix(zfcp_rules): correct shellcheck regression when parsing
+ ccw args
+ 
+Fixes 032ecd95c94b77f3f08237e0f765b355dacb9573
+ 
+Conflict:NA
+Reference:https://github.com/dracutdevs/dracut/commit/5d2bda46f4e75e85445ee4d3bd3f68bf966287b9
+---
+ modules.d/95zfcp_rules/parse-zfcp.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+ 
+diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
+index 5e7d9095..a474b81b 100755
+--- a/modules.d/95zfcp_rules/parse-zfcp.sh
++++ b/modules.d/95zfcp_rules/parse-zfcp.sh
+@@ -63,7 +63,8 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do
+         if [ -n "$ccw_arg" ]; then
+             OLDIFS="$IFS"
+             IFS="-"
+-            set -- "$ccw_arg"
++            # shellcheck disable=SC2086
++            set -- $ccw_arg
+             IFS="$OLDIFS"
+             _wwpn=${4%:*}
+             _lun=${4#*:}
+-- 
+2.33.0
+ 
diff --git a/dracut.spec b/dracut.spec
index 25c0510..26fd2ad 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -9,7 +9,7 @@
 
 Name: dracut
 Version: 059
-Release: 6
+Release: 7
 
 Summary: Initramfs generator using udev
 
@@ -39,6 +39,7 @@ Patch11: backport-fix-fs-lib-remove-quoting-form-the-first-argument-of.patch
 Patch12: backport-feat-systemd-install-systemd-executor.patch
 
 Patch6000: backport-fix-dracut.sh-remove-microcode-check-based-on-CONFIG.patch
+Patch6001: backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source2: openEuler.conf.example
@@ -527,6 +528,9 @@ rm -f 51-dracut-rescue-postinst.sh
 %endif
 
 %changelog
+* Thu Jun 13 2024 hongjinghao <hongjinghao@huawei.com> - 059-7
+- backport update stream
+
 * Thu Apr 18 2024 wangyuhang <wangyuhang27@huawei.com> - 059-6
 - Backport patches to remove microcode check based on CONFIG_MICROCODE_[AMD|INTEL]
 
-- 
Gitee