selftests/livepatch: adopt to newer sysctl error format
With procfs v3.3.16, the sysctl command doesn't print the set key and value on error. This change breaks livepatch selftest test-ftrace.sh, that tests the interaction of sysctl ftrace_enabled: Make it work with all sysctl versions using '-q' option. Explicitly print the final status on success so that it can be verified in the log. The error message is enough on failure. Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Signed-off-by: Petr Mladek <pmladek@suse.com> Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Reviewed-by: Joe Lawrence <joe.lawrence@redhat.com> Acked-by: Miroslav Benes <mbenes@suse.cz> Link: https://lore.kernel.org/r/20200714091030.1611-1-pmladek@suse.com
This commit is contained in:
Родитель
2f3f651f37
Коммит
5e4d46881f
|
@ -75,7 +75,8 @@ function set_dynamic_debug() {
|
|||
}
|
||||
|
||||
function set_ftrace_enabled() {
|
||||
result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ')
|
||||
result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \
|
||||
sysctl kernel.ftrace_enabled 2>&1)
|
||||
echo "livepatch: $result" > /dev/kmsg
|
||||
}
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition
|
|||
livepatch: '$MOD_LIVEPATCH': starting patching transition
|
||||
livepatch: '$MOD_LIVEPATCH': completing patching transition
|
||||
livepatch: '$MOD_LIVEPATCH': patching complete
|
||||
livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0
|
||||
livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy
|
||||
% echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled
|
||||
livepatch: '$MOD_LIVEPATCH': initializing unpatching transition
|
||||
livepatch: '$MOD_LIVEPATCH': starting unpatching transition
|
||||
|
|
Загрузка…
Ссылка в новой задаче