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] https://gitlab.com/procps-ng/procps/-/commit/6389deca5bf667f5fab5912acde78ba8e0febbc7 [2] https://gitlab.com/procps-ng/procps/-/commit/b159c198c9160a8eb13254e2b631d0035b9b542c
Unified · Split
| @@ -86,7 +86,7 @@ function set_ftrace_enabled() { · 85 unmodified lines | ||
| 86 | 86 | |
| 87 | 87 | if [[ "$result" != "$1" ]] ; then |
| 88 | 88 | if [[ $can_fail -eq 1 ]] ; then |
| 89 | − echo "livepatch: $err" > /dev/kmsg | |
| 89 | + echo "livepatch: $err" | sed 's#/proc/sys/kernel/#kernel.#' > /dev/kmsg | |
| 90 | 90 | return |
| 91 | 91 | fi |
| 92 | 92 | |