diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2022-02-01 18:19:36 -0500 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2022-02-14 01:07:19 +0800 |
| commit | ccbbd09981c762d865a5198f6fe31b2f07bbc274 (patch) | |
| tree | d125e533739891b2f1a30405bf238764577f6d44 | |
| parent | 290e6c83e8d8232a98c0bf154ea3c6d7e7a09b0d (diff) | |
| download | xfstests-dev-ccbbd09981c762d865a5198f6fe31b2f07bbc274.tar.gz | |
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 <tytso@mit.edu>
Fixes: 405c21d40aa1 ("common/module: add patient module rmmod support")
Reported-by: Leah Rumancik <leah.rumancik@gmail.com>
Cc: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rw-r--r-- | common/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/config b/common/config index 2b35774647..0566ab4a96 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 |