RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 01:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swap current dir (.) with CEPH_BIN for OOT builds

Browse Source 
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>
This commit is contained in:
Sam Lang 2012-09-19 13:57:53 -07:00
parent 0f7c516f3e
commit faddb80c42
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vstart.sh
View File

@ -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