aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Sergeev <stsp2@yandex.ru>2023-06-27 23:27:31 +0500
committerZorro Lang <zlang@kernel.org>2023-06-28 19:19:11 +0800
commit2c29b9b58618b4e9946613aecfe2cdc7268ead07 (patch)
tree81b0519ed8b68cbc7f762fcf888fa913994612a6
parent3e7166ffb2ef365fb987610e176ce145846f3e5a (diff)
downloadxfstests-dev-2c29b9b58618b4e9946613aecfe2cdc7268ead07.tar.gz
common/config: redirect modprobe helpinfo to stdout for busybox
Due to the busybox' modprobe writes help to stderr. We need to redirect it to stdout, or it will end up in a test results. Signed-off-by: Stas Sergeev <stsp2@yandex.ru> Reviewed-by: Zorro Lang <zlang@redhat.com> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rw-r--r--common/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/config b/common/config
index e479df8dd3..936ac225f4 100644
--- a/common/config
+++ b/common/config
@@ -261,7 +261,7 @@ export UDEV_SETTLE_PROG
# Set MODPROBE_PATIENT_RM_TIMEOUT_SECONDS to "forever" if you want the patient
# modprobe removal to run forever trying to remove a module.
MODPROBE_REMOVE_PATIENT=""
-modprobe --help >& /dev/null && modprobe --help | grep -q -1 "remove-patiently"
+modprobe --help >& /dev/null && modprobe --help 2>&1 | grep -q -1 "remove-patiently"
if [[ $? -ne 0 ]]; then
if [[ -z "$MODPROBE_PATIENT_RM_TIMEOUT_SECONDS" ]]; then
# We will open code our own implementation of patient module