Permalink
Browse files

Merge branch 'next'

  • Loading branch information...
2 parents bcd00c6 + 119880c commit 36d6c4f4c88e6b85515ef4b5be29b5eeb4400e1d @liewegas liewegas committed Aug 14, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/mkcephfs.in
View
@@ -265,8 +265,8 @@ if [ -n "$initdaemon" ]; then
fi
if [ $type = "mon" ]; then
- get_conf mon_data "/var/run/ceph/mon/ceph-$id" "mon data"
- if ! find "$mon_data" -maxdepth 0 -empty | read; then
+ get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data"
+ if test -d $mon_data && ! find "$mon_data" -maxdepth 0 -empty | read; then
echo "ERROR: $name mon_data directory $mon_data is not empty."
echo " Please make sure that it is empty before running mkcephfs."
exit 1

0 comments on commit 36d6c4f

Please sign in to comment.