From d91054f2d3f836df36006e9499bf61ea02bb20c7 Mon Sep 17 00:00:00 2001 From: Coiby Xu Date: Fri, 7 Jan 2022 12:30:52 +0800 Subject: [PATCH] use grep -s to suppress error messages about nonexistent or unreadable files Resolves: bz1895258 Upstream: Fedora Conflict: None commit d5c31605f364e258fdef60e8482498941644ad6a Author: Coiby Xu Date: Thu Jan 6 09:48:17 2022 +0800 use grep -s to suppress error messages about nonexistent or unreadable files When a file doesn't exist or isn't readable, grep complains as follows, grep: /proc/cmdline: No such file or directory grep: /etc/kernel/cmdline: No such file or directory /proc/cmdline doesn't exist when installing package for an OS image and /etc/kernel/cmdline may not exist if osbuild doesn't want set custom kernel cmdline. Use "-s" to suppress the error messages. Fixes: 0adb0f4 ("try to reset kernel crashkernel when kexec-tools updates the default crashkernel value") Fixes: ddd428a ("set up kernel crashkernel for osbuild in kernel hook") Signed-off-by: Coiby Xu Acked-by: Tao Liu Signed-off-by: Coiby Xu --- kdumpctl | 2 +- kexec-tools.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kdumpctl b/kdumpctl index 6e243a8..28c6074 100755 --- a/kdumpctl +++ b/kdumpctl @@ -1616,7 +1616,7 @@ reset_crashkernel_for_installed_kernel() exit 1 fi - if _is_osbuild && ! grep -q crashkernel= /etc/kernel/cmdline; then + if _is_osbuild && ! grep -qs crashkernel= /etc/kernel/cmdline; then reset_crashkernel "--kernel=$_installed_kernel" return fi diff --git a/kexec-tools.spec b/kexec-tools.spec index 90f9355..8b3fbda 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -262,7 +262,7 @@ mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/%{d %pre # save the old default crashkernel values to /tmp/ when upgrading the package -if ! grep -q "ostree" /proc/cmdline && [ $1 == 2 ] && grep -q get-default-crashkernel /usr/bin/kdumpctl; then +if ! grep -qs "ostree" /proc/cmdline && [ $1 == 2 ] && grep -q get-default-crashkernel /usr/bin/kdumpctl; then kdumpctl get-default-crashkernel kdump > /tmp/old_default_crashkernel 2>/dev/null %ifarch ppc64 ppc64le kdumpctl get-default-crashkernel fadump > /tmp/old_default_crashkernel_fadump 2>/dev/null @@ -304,7 +304,7 @@ fi # try to reset kernel crashkernel value to new default value when upgrading # the package -if ! grep -q "ostree" /proc/cmdline && [ $1 == 2 ]; then +if ! grep -qs "ostree" /proc/cmdline && [ $1 == 2 ]; then kdumpctl reset-crashkernel-after-update rm /tmp/old_default_crashkernel 2>/dev/null %ifarch ppc64 ppc64le