On Tue, Nov 16, 2021 at 09:29:26AM -0800, Luis Chamberlain wrote:
> diff --git a/common/rc b/common/rc
> index 85e6314..2b551bf 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -321,15 +321,143 @@ _uptime_s() {
> awk '{ print int($1) }' /proc/uptime
> }
>
> -# Arguments: module to unload ($1) and retry count ($2).
> -unload_module() {
> - local i m=$1 rc=${2:-1}
> -
> - [ ! -e "/sys/module/$m" ] && return 0
> - for ((i=rc;i>0;i--)); do
> - modprobe -r "$m"
> - [ ! -e "/sys/module/$m" ] && return 0
> - sleep .1
> +# 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"
Could you add the same guard I suggested for fstests for ancient
versions of modprobe? e.g.,:
modprobe --help >& /dev/null && modprobe --help | grep -q -1 "remove-patiently"
Thanks!
- Ted
