From 61e488737b0c4936dac0a756f827a945b0903508 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 9 Mar 2012 11:36:54 -0600 Subject: [PATCH] clean up scsi_debug module handling 2 little fixes to common scsi_debug handling. * don't consider the scsi_debug module in use in _require, unless it can't be rmmod'd * don't try to rmmod it in _put unless it is currently loaded Signed-off-by: Eric Sandeen Reviewed-by: Ben Myers --- common.scsi_debug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common.scsi_debug b/common.scsi_debug index 9f9177c1..a085a673 100644 --- a/common.scsi_debug +++ b/common.scsi_debug @@ -26,7 +26,7 @@ _require_scsi_debug() { # make sure we have the module and it's not already used modinfo scsi_debug 2>&1 > /dev/null || _notrun "scsi_debug module not found" - lsmod | grep -wq scsi_debug && _notrun "scsi_debug module in use" + lsmod | grep -wq scsi_debug && (rmmod scsi_debug || _notrun "scsi_debug module in use") # make sure it has the features we need # logical/physical sectors plus unmap support all went in together modinfo scsi_debug | grep -wq sector_size || _notrun "scsi_debug too old" @@ -58,5 +58,6 @@ _get_scsi_debug_dev() _put_scsi_debug_dev() { sleep 1 + lsmod | grep -wq scsi_debug || return rmmod scsi_debug || _fail "Could not remove scsi_debug module" } -- 2.30.2