Fall back to meta-data/public-keys if meta-data/public-keys/0/openssh…

…-key is not available.
reyk · May 7, 2018 · 9ffe04f · 9ffe04f
1 parent eaa8b96
commit 9ffe04f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/agent/cloudinit.c b/agent/cloudinit.c
@@ -77,7 +77,9 @@ cloudinit_fetch(struct system_config *sc)
 
 	/* pubkey */
 	if ((str = metadata(sc,
-	    "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL)
+	    "/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)
 		goto fail;