src/vstart.sh: Only execute btrfs if it is available #11683
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
requested changes
Nov 2, 2016
| @@ -661,7 +661,9 @@ if [ "$start_osd" -eq 1 ]; then | |||
| EOF | |||
|
|
|||
| rm -rf $CEPH_DEV_DIR/osd$osd || true | |||
| for f in $CEPH_DEV_DIR/osd$osd/*; do btrfs sub delete $f &> /dev/null || true; done | |||
| if [ -x /usr/bin/btrfs ]; then | |||
There was a problem hiding this comment.
btrfs is considered as a system administration command, and usually lives in /usr. probably you can use command -v instead to avoid this fuss? i.e.
if command -v btrfs > /dev/null; then
...
fior
if [ -x `command -v btrfs` ]; then
...
fifor less typing.
There was a problem hiding this comment.
@tchaikov
Never too old to learn. 8=) checking out command
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-freebsd-vstart
branch
from
7783a2d
to
04b2a9a
Compare
|
@tchaikov |
|
lgtm |
tchaikov
approved these changes
Nov 2, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Willem Jan Withagen wjw@digiware.nl