From: Sage Weil <sage@inktank.com>
Date: Mon, 8 Jul 2013 16:58:16 +0000 (-0700)
Subject: qa/workunits/rbd/kernel.sh: move modprobe up
X-Git-Tag: v0.67-rc1~143
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d423cf8c4f91270f865cb4148dcf2da7f6dce9bb;p=ceph.git

qa/workunits/rbd/kernel.sh: move modprobe up

Needs to happen before cleanup.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/qa/workunits/rbd/kernel.sh b/qa/workunits/rbd/kernel.sh
index 0fc2c72b560f..447e9bea0ecb 100755
--- a/qa/workunits/rbd/kernel.sh
+++ b/qa/workunits/rbd/kernel.sh
@@ -30,12 +30,12 @@ function clean_up {
 	sudo rm -f $TMP_FILES
 }
 
+[ -d /sys/bus/rbd ] || sudo modprobe rbd
+
 clean_up
 
 trap clean_up INT TERM EXIT
 
-[ -d /sys/bus/rbd ] || sudo modprobe rbd
-
 # allow ubuntu user to map/unmap rbd devices
 sudo chown ubuntu /sys/bus/rbd/add /sys/bus/rbd/remove