mirror of
https://github.com/ceph/ceph
synced 2025-01-10 05:00:59 +00:00
vstart.sh: Make sure mkdir succeeds
Even in the case the full path was not created, make sure mkdir does create the full path. And while there replaced some `test ....` with `[ ... ]` like in the remainder of the file. Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
This commit is contained in:
parent
48d6afb9e8
commit
4f1c7815af
@ -1027,17 +1027,17 @@ fi
|
||||
[ -z "$INIT_CEPH" ] && INIT_CEPH=$CEPH_BIN/init-ceph
|
||||
|
||||
# sudo if btrfs
|
||||
test -d $CEPH_DEV_DIR/osd0/. && test -e $CEPH_DEV_DIR/sudo && SUDO="sudo"
|
||||
[ -d $CEPH_DEV_DIR/osd0/. ] && [ -e $CEPH_DEV_DIR/sudo ] && SUDO="sudo"
|
||||
|
||||
prun $SUDO rm -f core*
|
||||
|
||||
test -d $CEPH_ASOK_DIR || mkdir $CEPH_ASOK_DIR
|
||||
test -d $CEPH_OUT_DIR || mkdir $CEPH_OUT_DIR
|
||||
test -d $CEPH_DEV_DIR || mkdir $CEPH_DEV_DIR
|
||||
[ -d $CEPH_ASOK_DIR ] || mkdir -p $CEPH_ASOK_DIR
|
||||
[ -d $CEPH_OUT_DIR ] || mkdir -p $CEPH_OUT_DIR
|
||||
[ -d $CEPH_DEV_DIR ] || mkdir -p $CEPH_DEV_DIR
|
||||
$SUDO rm -rf $CEPH_OUT_DIR/*
|
||||
test -d gmon && $SUDO rm -rf gmon/*
|
||||
[ -d gmon ] && $SUDO rm -rf gmon/*
|
||||
|
||||
[ "$cephx" -eq 1 ] && [ "$new" -eq 1 ] && test -e $keyring_fn && rm $keyring_fn
|
||||
[ "$cephx" -eq 1 ] && [ "$new" -eq 1 ] && [ -e $keyring_fn ] && rm $keyring_fn
|
||||
|
||||
|
||||
# figure machine's ip
|
||||
|
Loading…
Reference in New Issue
Block a user