2 files changed, 5 insertions, 4 deletions
diff --git a/.zshrc b/.zshrc
index cc048f8..e5c3a7d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -797,8 +797,8 @@ NO_verbose		\
 
 # GPG / SSH AGENT
 
-if [[ "KEYCHAIN" = "True" ]]; then
-    keychain id_rsa
+if [ "xKEYCHAIN" != "x" ]; then
+    keychain KEYCHAIN
     #keychain -Q ${GPGKEY} ${GPGKEY1}
     [ -z "$HOSTNAME" ] && HOSTNAME=`uname -n`
     [ -f $HOME/.keychain/$HOSTNAME-sh ] &&
diff --git a/SUBSTS b/SUBSTS
index 7bb86ed..c9f8fb1 100644
--- a/SUBSTS
+++ b/SUBSTS
@@ -55,8 +55,9 @@ GREP_PATH /bin/grep
 # path to gnome-settings-daemon
 GSD_PATH /usr/local/libexec/gnome-settings-daemon
 
-# Enable keychain? If so, set to True
-KEYCHAIN True
+# Enable keychain? If so, set to secret key names, e.g., id_rsa id_ecdsa
+# Otherwise, delete everything after N
+KEYCHAIN id_rsa
 
 # Path to SSL certs for mail, etc.
 # /etc/ssl/cert.pem on OpenBSD