From: Sage Weil <sage@newdream.net>
Date: Wed, 25 May 2011 00:05:30 +0000 (-0700)
Subject: mkcephfs: error out on bad usage
X-Git-Tag: v0.29~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c67dd164a412faa89e09c7ec1949eef17a49c994;p=ceph.git

mkcephfs: error out on bad usage

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mkcephfs.in b/src/mkcephfs.in
index 8558754e58c4..0e0ca6e59505 100644
--- a/src/mkcephfs.in
+++ b/src/mkcephfs.in
@@ -61,6 +61,7 @@ fi
 
 usage_exit() {
     echo "usage: $0 -a -c ceph.conf [-k adminkeyring] [--mkbtrfs]"
+    echo "   to generate a new ceph cluster on all nodes; for advanced usage see man page"
     echo "   ** be careful, this WILL clobber old data; check your ceph.conf carefully **"
     exit
 }
@@ -168,6 +169,14 @@ done
 
 [ -z "$conf" ] && [ -n "$dir" ] && conf="$dir/conf"
 
+if [ $allhosts -eq 1 ]; then
+    if [ $preparemonmap -eq 1 ] || [ -n "$initdaemon" ] || [ -n "$initlocaldaemons" ] || [ -n "$prepareosdfs" ] || [ -n "$preparemon" ] ; then
+	echo "The -a option cannot be combined with other subcommands; see man page."
+	usage_exit
+    fi
+fi
+
+
 
 ### prepare-monmap ###