From f48b2bc2b974920977c28879a4cb24346ff58a47 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Tue, 8 May 2018 10:03:38 +0200 Subject: [PATCH] Make the public key optional but print a warning --- agent/cloudinit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/cloudinit.c b/agent/cloudinit.c index 2bf4b91..c6bf38c 100644 --- a/agent/cloudinit.c +++ b/agent/cloudinit.c @@ -75,13 +75,13 @@ cloudinit_fetch(struct system_config *sc) "/latest/meta-data/local-hostname", WORD)) == NULL) goto fail; - /* pubkey */ + /* optional pubkey */ if ((str = metadata(sc, "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL && (str = metadata(sc, "/latest/meta-data/public-keys", LINE)) == NULL) - goto fail; - if (agent_addpubkey(sc, str, NULL) != 0) + log_warnx("failed to get public key"); + else if (agent_addpubkey(sc, str, NULL) != 0) goto fail; /* optional username - this is an extension by meta-data(8) */