diff options
| author | Sam Lang <sam.lang@inktank.com> | 2012-09-19 22:57:53 +0200 |
|---|---|---|
| committer | Sam Lang <sam.lang@inktank.com> | 2012-09-19 22:57:53 +0200 |
| commit | faddb80c4230acad2b4a17aa6cbf0c30ae8d24a9 (patch) | |
| tree | db191a92644e5f82109fe73a3a7ffaebf5eb27d2 /src/vstart.sh | |
| parent | Move keyring option to global section (diff) | |
| download | ceph-faddb80c4230acad2b4a17aa6cbf0c30ae8d24a9.tar.xz ceph-faddb80c4230acad2b4a17aa6cbf0c30ae8d24a9.zip | |
Swap current dir (.) with CEPH_BIN for OOT builds
With out-of-tree builds, vstart.sh needs CEPH_BIN to be set, and
needs to look for init-ceph in CEPH_BIN rather than just ./init-ceph.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Diffstat (limited to 'src/vstart.sh')
| -rwxr-xr-x | src/vstart.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vstart.sh b/src/vstart.sh index 691aeecad20..67a4157afd3 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -193,12 +193,15 @@ fi # lockdep everywhere? # export CEPH_ARGS="--lockdep 1" +[ -z "$CEPH_BIN" ] && CEPH_BIN=. +[ -z "$CEPH_PORT" ] && CEPH_PORT=6789 + # sudo if btrfs test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo" if [ "$start_all" -eq 1 ]; then - $SUDO ./init-ceph stop + $SUDO $CEPH_BIN/init-ceph stop fi $SUDO rm -f core* @@ -224,9 +227,6 @@ else fi echo "ip $IP" -[ -z "$CEPH_BIN" ] && CEPH_BIN=. -[ -z "$CEPH_PORT" ] && CEPH_PORT=6789 - if [ "$cephx" -eq 1 ]; then |