From 60550bf4e0804db6d592cd77ffea534bdd937da2 Mon Sep 17 00:00:00 2001 From: chenhaixiang Date: Fri, 30 Dec 2022 14:20:19 +0800 Subject: [PATCH] fix shellcheck error in dracut module setup Signed-off-by: chenhaixiang3@huawei.com --- dracut-module-setup.sh | 7 ++++--- kexec-tools.spec | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index fdef509..899e7ed 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -232,7 +232,8 @@ kdump_setup_ifname() { kdump_setup_bridge() { local _netdev=$1 local _brif _dev _mac _kdumpdev - for _dev in `ls /sys/class/net/$_netdev/brif/`; do + for _dev in /sys/class/net/$_netdev/brif/* ; do + [[ -e "$_dev" ]] || break _kdumpdev=$_dev if kdump_is_bond "$_dev"; then kdump_setup_bond "$_dev" @@ -463,11 +464,11 @@ kdump_install_conf() { case "$_opt" in raw) _pdev=$(persistent_policy="by-id" kdump_get_persistent_dev $_val) - sed -i -e "s#^$_opt[[:space:]]\+$_val#$_opt $_pdev#" ${initdir}/tmp/$$-kdump.conf + sed -i -e "s#^${_opt}[[:space:]]\+$_val#$_opt $_pdev#" ${initdir}/tmp/$$-kdump.conf ;; ext[234]|xfs|btrfs|minix) _pdev=$(kdump_get_persistent_dev $_val) - sed -i -e "s#^$_opt[[:space:]]\+$_val#$_opt $_pdev#" ${initdir}/tmp/$$-kdump.conf + sed -i -e "s#^${_opt}[[:space:]]\+$_val#$_opt $_pdev#" ${initdir}/tmp/$$-kdump.conf ;; ssh|nfs) kdump_install_net "$_val" diff --git a/kexec-tools.spec b/kexec-tools.spec index b930891..55330d2 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -4,7 +4,7 @@ Name: kexec-tools Version: 2.0.23 -Release: 10 +Release: 11 License: GPLv2 Summary: The kexec/kdump userspace component URL: https://www.kernel.org/ @@ -312,6 +312,9 @@ done %endif %changelog +* Fri Dec 30 2022 chenhaixiang - 2.0.23-11 +- fix shellcheck error in dracut module setup + * Mon Dec 12 2022 guojiancheng - 2.0.23-10 - Add sw support -- Gitee