rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use grep -s to suppress error messages about nonexistent or unreadable files

Browse Source 
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 <coxu@redhat.com>
Acked-by: Tao Liu <ltao@redhat.com>
This commit is contained in:
Coiby Xu 2022-01-06 09:48:17 +08:00
parent 2bd59ee156
commit d5c31605f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kdumpctl
View File

@ -1590,7 +1590,7 @@ reset_crashkernel_for_installed_kernel()
exit 1 exit 1
fi 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" reset_crashkernel "--kernel=$_installed_kernel"
return return
fi fi

4
kexec-tools.spec
View File

@ -261,7 +261,7 @@ mv $RPM_BUILD_ROOT/etc/kdump-adv-conf/kdump_dracut_modules/* $RPM_BUILD_ROOT/%{d
%pre %pre
# save the old default crashkernel values to /tmp/ when upgrading the package # 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 kdumpctl get-default-crashkernel kdump > /tmp/old_default_crashkernel 2>/dev/null
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le
kdumpctl get-default-crashkernel fadump > /tmp/old_default_crashkernel_fadump 2>/dev/null kdumpctl get-default-crashkernel fadump > /tmp/old_default_crashkernel_fadump 2>/dev/null
@ -303,7 +303,7 @@ fi
# try to reset kernel crashkernel value to new default value when upgrading # try to reset kernel crashkernel value to new default value when upgrading
# the package # 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 kdumpctl reset-crashkernel-after-update
rm /tmp/old_default_crashkernel 2>/dev/null rm /tmp/old_default_crashkernel 2>/dev/null
%ifarch ppc64 ppc64le %ifarch ppc64 ppc64le