From 0a954752d9c544aa726b039f8e69ce71a7cbc360 Mon Sep 17 00:00:00 2001
From: Tom Mast <tom.mast@vodori.com>
Date: Thu, 25 Sep 2014 15:19:49 -0500
Subject: [PATCH] blackbox: Update README, add --homedir to encryption step in
 _blackbox_common

---
 README.md               | 2 +-
 bin/_blackbox_common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b6606ff..524acc0 100644
--- a/README.md
+++ b/README.md
@@ -475,7 +475,7 @@ Back on SECUREHOST, add the new email address to keyrings/live/blackbox-admins.t
 
 ```
 cd /path/to/the/repo
-blackbox_addadmin $KEYNAME
+blackbox_addadmin $KEYNAME /tmp/NEWMASTER
 ```
 
 Verify that secring.gpg is a zero-length file. If it isn't, you have
diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index af77c88..824065a 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -144,7 +144,7 @@ function encrypt_file() {
   encrypted="$2"
 
   echo "========== Encrypting: $unencrypted"
-  gpg --yes --trust-model=always --encrypt -o "$encrypted"  $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted"
+  gpg --yes --trust-model=always --homedir keyrings/live/ --encrypt -o "$encrypted"  $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted"
   echo '========== Encrypting: DONE'
 }