From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Sat, 28 Feb 2009 01:11:10 +0000 (-0800)
Subject: ceph-daemons: some more fixes
X-Git-Tag: v0.7~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f34dafd4e79bb9ff0f3421be6c1088c3f77c2964;p=ceph.git

ceph-daemons: some more fixes
---

diff --git a/src/ceph-daemons b/src/ceph-daemons
index 93a288838672..675b6a3aef18 100755
--- a/src/ceph-daemons
+++ b/src/ceph-daemons
@@ -101,7 +101,7 @@ for name in $what; do
     sections="$name $type global"
 
     # this host?
-    host=`$CCONF -c $conf -s $name -s $type -s global host`
+    host=`$CCONF --conf_file $conf -s $name -s $type -s global host`
     ssh=""
     cmd=""
     if [[ $host != "" ]]; then
@@ -114,7 +114,7 @@ for name in $what; do
 
 	    # we'll need to ssh into that host
 	    ssh="ssh root@$host"
-	    cd_path=`$CCONF -c $conf -s $name -s $type -s global "ssh path"`
+	    cd_path=`$CCONF --conf_file $conf -s $name -s $type -s global "ssh path"`
 	fi
     else
 	host=$hostname
@@ -128,17 +128,18 @@ for name in $what; do
     if [[ $name =~ "mon" ]]; then
 	get_conf mon_path "" "mon path" $sections
 	cmd="$BINDIR/cmon $mon_path"
+	echo cmd=$cmd
     fi
 
     if [[ $name =~ "mds" ]]; then
-	cmd="$BINDIR/cmds -c $conf_file $mon_addr_cmd"
+	cmd="$BINDIR/cmds --conf_file $conf_file $mon_addr_cmd"
     fi
 
     if [[ $name =~ "osd" ]]; then
 	get_conf osd_data "" "osd data" $sections
 	get_conf osd_journal "" "osd journal" $sections
 	[ "$osd_journal" != "" ] && osd_journal_cmd="-j $osd_journal" || osd_journal_cmd=""
-	cmd="$BINDIR/cosd -c $conf_file \
+	cmd="$BINDIR/cosd --conf_file $conf_file \
 			$mon_addr_cmd $osd_data $osd_journal_cmd"
     fi
 
diff --git a/src/cmon.cc b/src/cmon.cc
index 2f217ddf7b48..05e35b4a286a 100644
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -56,11 +56,14 @@ int main(int argc, const char **argv)
   // args
   const char *fsdir = 0;
   for (unsigned i=0; i<args.size(); i++) {
-    if (!fsdir)
-      fsdir = args[i];
-    else 
-      usage();
+    if (args[i][0] != '-') {
+      if (!fsdir)
+        fsdir = args[i];
+      else if (fsdir)
+        usage();
+    }
   }
+
   if (!fsdir)
     usage();