From patchwork Sat Jul 14 00:01:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Watkins X-Patchwork-Id: 1197241 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 90008E006E for ; Sat, 14 Jul 2012 00:01:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756583Ab2GNABV (ORCPT ); Fri, 13 Jul 2012 20:01:21 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]:60962 "EHLO mail-ob0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756590Ab2GNABS (ORCPT ); Fri, 13 Jul 2012 20:01:18 -0400 Received: by obbuo13 with SMTP id uo13so5614626obb.19 for ; Fri, 13 Jul 2012 17:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ucsc.edu; s=ucsc-google; h=sender:from:content-type:content-transfer-encoding:subject:date :message-id:to:mime-version:x-mailer; bh=j4HtxPf5JYcw6nb2Cvi6i/vBjnVJQRhWejfkIkoeIYg=; b=jxB776ymDxMg71cDgirE8zMP8AwBtC339hYlXPdBv3nuETewU4GVGoXAbWq3XxQxZ4 RoJhW94Hk31U4PW4vRr+C/i73+qos0as+PUXMCEcVC/1OKIWz+TKZ+DmF8W377t68n3i n+cCaUWLdQ9vqSLTWpGpn3wWju33/wu+j3jsk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:content-type:content-transfer-encoding:subject:date :message-id:to:mime-version:x-mailer:x-gm-message-state; bh=j4HtxPf5JYcw6nb2Cvi6i/vBjnVJQRhWejfkIkoeIYg=; b=nI7ABcMK7JCmVuh8vOQXJCvE2FBuclIsdD+viIECmJbrXSz2/Xmlm0Urwrp5u6ZCPX dIiwTf8jhkJksQVA9R6juw+A4cR7vgftPiEavbv0yJxCiuDElYSaXF7qzRl6J606nw5k xsSgLPx8nE6seGvHGLfTYm6whggFKVZKtD/coe1ElokZw3fgJxN3ZBvvl7/8+D/kuzwW I38wbKXnkOhEWtpdvDAWERBNQjY6RxnReQilSNVj331JNGmiezBygAMcgGsWClWoLCXS tg/G/qLoNQwNVAjvFRCRbZNV/6HTjRwhzuRl4y+HASb1W+Yy7MASZXRIrxWPZL3/4z2J PdsA== Received: by 10.60.10.227 with SMTP id l3mr4206953oeb.39.1342224078050; Fri, 13 Jul 2012 17:01:18 -0700 (PDT) Received: from martini.almaden.ibm.com (p1.almaden.ibm.com. [198.4.83.52]) by mx.google.com with ESMTPS id g8sm7685017obz.16.2012.07.13.17.01.17 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 17:01:17 -0700 (PDT) From: Noah Watkins Subject: [PATCH] vstart: use absolute path for keyring Date: Fri, 13 Jul 2012 17:01:15 -0700 Message-Id: To: ceph-devel@vger.kernel.org Mime-Version: 1.0 (Apple Message framework v1257) X-Mailer: Apple Mail (2.1257) X-Gm-Message-State: ALoCoQkiswN8mcBItRJL/R+DmocukKQtbt3SvwYTDR0NlYH5ZKJOufpmKrD7wyIWVpGYJ9GcFMYc Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Stores absolute path to the generated keyring so that tests running in other directories (e.g. src/java/test) can simply reference the generated ceph.conf. --- src/vstart.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index 1a5cf68..f6dece3 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -22,7 +22,7 @@ MON_ADDR="" conf="ceph.conf" -keyring_fn="keyring" +keyring_fn="$PWD/keyring" osdmap_fn="/tmp/ceph_osdmap.$$" monmap_fn="/tmp/ceph_monmap.$$" @@ -271,7 +271,7 @@ EOF cat <> $conf [client] - keyring = keyring + keyring = $keyring_fn [mds] $DAEMONOPTS