s/ck_cmdline/_ck_cmdline to fix kdump_get_arch_recommend_size.

Note s/sysmem/_sys_mem as well to make the changes consistent.

Fixes: 105c016 ("factor out kdump_get_arch_recommend_crashkernel") Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt; --- kdump-lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kdump-lib.sh b/kdump-lib.sh index c6bdd2e..3e912cc 100755 --- a/kdump-lib.sh +++ b/kdump-lib.sh @@ -864,16 +864,16 @@ kdump_get_arch_recommend_crashkernel() # $1: kernel version, if not set, will defaults to $(uname -r) kdump_get_arch_recommend_size() { - local _ck_cmdline + local _ck_cmdline _sys_mem if ! [[ -r "/proc/iomem" ]]; then echo "Error, can not access /proc/iomem." return 1 fi - sys_mem=$(get_system_size) + _sys_mem=$(get_system_size) _ck_cmdline=$(kdump_get_arch_recommend_crashkernel) _ck_cmdline=${_ck_cmdline//-:/-102400T:} - get_recommend_size "$sys_mem" "$ck_cmdline" + get_recommend_size "$_sys_mem" "$_ck_cmdline" } # Print all underlying crypt devices of a block device -- 2.34.1 _______________________________________________ kexec mailing list -- kexec(a)lists.fedoraproject.org To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure

Hi Tao, On Wed, Jan 26, 2022 at 02:05:41PM +0800, Tao Liu wrote: >Hi Coiby, > >On Wed, Jan 26, 2022 at 9:01 AM Coiby Xu <coxu(a)redhat.com&gt; wrote: >> >> s/ck_cmdline/_ck_cmdline to fix kdump_get_arch_recommend_size. >> >By looking at the commit log, I didn't get why ck_cmdline should be >renamed to _ck_cmdline, >and what the problem the patch is trying to fix. Maybe you can >describe more about >the fixing problem. > >> Note s/sysmem/_sys_mem as well to make the changes consistent. > >Should it be s/sys_mem/_sys_mem here? > >For the rest of the patch: > >Acked-by: Tao Liu <ltao(a)redhat.com&gt; Thanks for the two suggestions! I've applied them to the new commit message, fix broken kdump_get_arch_recommend_size shellcheck finds the following problem, $ shellcheck kdump-lib.sh In kdump-lib.sh line 876: get_recommend_size "$sys_mem" "$ck_cmdline" ^---------^ SC2154: ck_cmdline is referenced but not assigned (did you mean '_ck_cmdline'?). s/ck_cmdline/_ck_cmdline to fix kdump_get_arch_recommend_size. Note s/sys_mem/_sys_mem as well to make the changes consistent. And the patch has also been merged.

>> >> Fixes: 105c016 ("factor out kdump_get_arch_recommend_crashkernel") >> Signed-off-by: Coiby Xu <coxu(a)redhat.com&gt; >> --- >> kdump-lib.sh | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/kdump-lib.sh b/kdump-lib.sh >> index c6bdd2e..3e912cc 100755 >> --- a/kdump-lib.sh >> +++ b/kdump-lib.sh >> @@ -864,16 +864,16 @@ kdump_get_arch_recommend_crashkernel() >> # $1: kernel version, if not set, will defaults to $(uname -r) >> kdump_get_arch_recommend_size() >> { >> - local _ck_cmdline >> + local _ck_cmdline _sys_mem >> >> if ! [[ -r "/proc/iomem" ]]; then >> echo "Error, can not access /proc/iomem." >> return 1 >> fi >> - sys_mem=$(get_system_size) >> + _sys_mem=$(get_system_size) >> _ck_cmdline=$(kdump_get_arch_recommend_crashkernel) >> _ck_cmdline=${_ck_cmdline//-:/-102400T:} >> - get_recommend_size "$sys_mem" "$ck_cmdline" >> + get_recommend_size "$_sys_mem" "$_ck_cmdline" >> } >> >> # Print all underlying crypt devices of a block device >> -- >> 2.34.1 >> _______________________________________________ >> kexec mailing list -- kexec(a)lists.fedoraproject.org >> To unsubscribe send an email to kexec-leave(a)lists.fedoraproject.org >> Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ >> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines >> List Archives: https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org >> Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure > -- Best regards, Coiby