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 0000000000000000000000000000000000000000..1667c5dad3469056935f12461a522ebac0aa4382 --- /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 +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 5edf161c65cafc5eb1550ee7e7a7caff02ae5ec9..57497bfaef269b8ca601db393dcf645dcf7f44f3 100644 --- a/dracut.spec +++ b/dracut.spec @@ -9,7 +9,7 @@ Name: dracut Version: 055 -Release: 12 +Release: 13 Summary: Initramfs generator using udev @@ -98,6 +98,7 @@ Patch6047: backport-fix-dracut-functions.sh-suppress-findmnt-error-msg-if-etc-fs Patch6048: backport-fix-dracut-logger.sh-this-fixes-the-dlog_init-check-for-dev-log.patch Patch6049: backport-fix-dracut-replace-invalid-lzo-command-with-lzop-for-LZO-compression.patch Patch6050: backport-fix-squash-apply-FIPS-and-libpthread-workaround.patch +Patch6051: backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch Patch9000: remove-iscsi-related-code-since-it-is-no-longer-main.patch @@ -574,6 +575,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* Thu Jun 13 2024 hongjinghao - 055-13 +- backport patchs from upstream + * Fri Jun 07 2024 yanglongkang - 055-12 - Type:bugfix - ID:NA