From b5f4558b7a1171075b60a88b40473e514a02365a Mon Sep 17 00:00:00 2001 From: Cameron Stokes Date: Wed, 4 Jan 2017 09:01:17 -0800 Subject: [PATCH] Fix generate-root help and progress output. --- command/generate-root.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/command/generate-root.go b/command/generate-root.go index c2c7348ce..07c550096 100644 --- a/command/generate-root.go +++ b/command/generate-root.go @@ -267,7 +267,7 @@ func (c *GenerateRootCommand) dumpStatus(status *api.GenerateRootStatusResponse) statString := fmt.Sprintf( "Nonce: %s\n"+ "Started: %v\n"+ - "Rekey Progress: %d\n"+ + "Generate Root Progress: %d\n"+ "Required Keys: %d\n"+ "Complete: %t", status.Nonce, @@ -301,7 +301,7 @@ Usage: vault generate-root [options] [key] One (and only one) of the following must be provided at attempt initialization time: - + 1) A 16-byte, base64-encoded One Time Password (OTP) provided in the '-otp' flag; the token is XOR'd with this value before it is returned once the final unseal key has been provided. The '-decode' operation can be used with this @@ -313,10 +313,10 @@ Usage: vault generate-root [options] [key] 2) A file containing a PGP key (binary or base64-encoded) or a Keybase.io username in the format of "keybase:" in the '-pgp-key' flag. The final token value will be encrypted with this public key and base64-encoded. - + General Options: ` + meta.GeneralOptionsUsage() + ` -Rekey Options: +Generate Root Options: -init Initialize the root generation attempt. This can only be done if no generation is already initiated.