From ccbbd09981c762d865a5198f6fe31b2f07bbc274 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 1 Feb 2022 18:19:36 -0500 Subject: [PATCH] common: handle old versions of modprobe which don't support --help There exists versions of modprobe out there which are so old that modprobe --help isn't a thing. They're certainly not going to support modprobe --remove-patiently, so test to make sure modprobe --help works to avoid causing all tests to fail due to the error message to stderr showing up in $seq.out. Signed-off-by: Theodore Ts'o Fixes: 405c21d40aa1 ("common/module: add patient module rmmod support") Reported-by: Leah Rumancik Cc: Luis Chamberlain Reviewed-by: Luis Chamberlain Signed-off-by: Eryu Guan --- common/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config b/common/config index 2b357746..0566ab4a 100644 --- a/common/config +++ b/common/config @@ -256,7 +256,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 | grep -q -1 "remove-patiently" +modprobe --help >& /dev/null && modprobe --help | 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 -- 2.39.5