From: Kefu Chai Date: Sun, 27 Aug 2017 02:14:14 +0000 (+0800) Subject: Merge pull request #16494 from asomers/bin_bash X-Git-Tag: v13.0.1~1173 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30b5b4627cb28385f442874fa8976116edaae787;p=ceph.git Merge pull request #16494 from asomers/bin_bash misc: Fix bash path in shebangs Reviewed-by: Willem Jan Withagen Reviewed-by: Kefu Chai --- 30b5b4627cb28385f442874fa8976116edaae787 diff --cc qa/workunits/rbd/journal.sh index 60b5a41038f1,f4813afc8be2..34a7451ff3b3 --- a/qa/workunits/rbd/journal.sh +++ b/qa/workunits/rbd/journal.sh @@@ -1,6 -1,7 +1,7 @@@ - #!/bin/bash -e + #!/usr/bin/env bash + set -e -. $(dirname $0)/../ceph-helpers.sh +. $(dirname $0)/../../standalone/ceph-helpers.sh function list_tests() { diff --cc qa/workunits/rbd/rbd-nbd.sh index 524f8bd3fc25,e7628762a2b2..84bdd217e27c --- a/qa/workunits/rbd/rbd-nbd.sh +++ b/qa/workunits/rbd/rbd-nbd.sh @@@ -1,6 -1,7 +1,7 @@@ - #!/bin/bash -ex + #!/usr/bin/env bash + set -ex -. $(dirname $0)/../ceph-helpers.sh +. $(dirname $0)/../../standalone/ceph-helpers.sh POOL=rbd IMAGE=testrbdnbd$$