diff --git a/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch b/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch index 1667c5dad3469056935f12461a522ebac0aa4382..99464f2f850c39cdfe4aa643d13297e0161fdefd 100644 --- a/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch +++ b/backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch @@ -3,15 +3,25 @@ From: Ihno Krumreich Date: Wed, 28 Feb 2024 08:24:35 +0100 Subject: [PATCH] fix(zfcp_rules): correct shellcheck regression when parsing ccw args +<<<<<<< HEAD Fixes 032ecd95c94b77f3f08237e0f765b355dacb9573 +======= + +Fixes 032ecd95c94b77f3f08237e0f765b355dacb9573 + +>>>>>>> 5ad0a56 (backport update stream) 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(-) +<<<<<<< HEAD +======= + +>>>>>>> 5ad0a56 (backport update stream) 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 @@ -28,4 +38,8 @@ index 5e7d9095..a474b81b 100755 _lun=${4#*:} -- 2.33.0 +<<<<<<< HEAD +======= + +>>>>>>> 5ad0a56 (backport update stream) diff --git a/dracut.spec b/dracut.spec index ef2ee98cf40072d2c63cc5189be0b4d2ebed7c12..84110ebf8d1de18130555d5cf8d8279642337afe 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 059 -Release: 8 +Release: 9 Summary: Initramfs generator using udev @@ -39,8 +39,8 @@ 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 Patch6003: backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch +Patch6004: backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt Source2: openEuler.conf.example @@ -529,6 +529,10 @@ rm -f 51-dracut-rescue-postinst.sh %endif %changelog +* Wed Jul 31 2024 hongjinghao - 059-9 +- backport update stream + backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch + * Thu Jul 11 2024 zhengxiaoxiao - 059-8 - add backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch