From 2978fbdefb9d58e1985b61ca0cae35aeafb49d43 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Fri, 30 Jun 2017 18:29:23 +0200 Subject: [PATCH] Add support for @reyk/meta-data username extension --- agent/cloudinit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agent/cloudinit.c b/agent/cloudinit.c index 5795d1e..e280adf 100644 --- a/agent/cloudinit.c +++ b/agent/cloudinit.c @@ -88,7 +88,7 @@ cloudinit_fetch(struct system_config *sc) sc->sc_addr.ip = sc->sc_endpoint; sc->sc_addr.family = 4; - /* hostname */ + /* instance-id */ if ((sc->sc_instance = cloudinit_get(sc, "/latest/meta-data/instance-id", NULL)) == NULL) goto fail; @@ -105,6 +105,13 @@ cloudinit_fetch(struct system_config *sc) if (agent_addpubkey(sc, str, NULL) != 0) goto fail; + /* optional username - this is an extension by meta-data(8) */ + if ((str = cloudinit_get(sc, + "/latest/meta-data/username", NULL)) != NULL) { + free(sc->sc_username); + sc->sc_username = str; + } + /* userdata */ if ((sc->sc_userdata = cloudinit_get(sc, "/latest/user-data", &sc->sc_userdatalen)) == NULL)