selftests/livepatch: normalize sysctl error message
The livepatch kselftests rely on comparing expected and actual output from such commands as sysctl. A recent commit in procps-ng v4.0.0 [1] changed sysctl's output to emit key pathnames like: sysctl: setting key "/proc/sys/kernel/ftrace_enabled": Device or resource busy versus previous dotted output: sysctl: setting key "kernel.ftrace_enabled": Device or resource busy The modification in output was later reverted [2], but since the change has been tagged in procps-ng v4.0.0, update the livepatch kselftest to handle either case. [1]6389deca5b
[2]b159c198c9
Reported-by: Dennis(Zhuoheng) Li <denli@redhat.com> Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20220811212138.182575-1-joe.lawrence@redhat.com
This commit is contained in:
parent
66d8529d0f
commit
857300b7d5
@ -86,7 +86,7 @@ function set_ftrace_enabled() {
|
||||
|
||||
if [[ "$result" != "$1" ]] ; then
|
||||
if [[ $can_fail -eq 1 ]] ; then
|
||||
echo "livepatch: $err" > /dev/kmsg
|
||||
echo "livepatch: $err" | sed 's#/proc/sys/kernel/#kernel.#' > /dev/kmsg
|
||||
return
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user