From ea30b79a625301452652e9e8813c767fa5def70a Mon Sep 17 00:00:00 2001 From: Derek Gonyeo Date: Wed, 21 Jun 2017 16:33:04 -0700 Subject: [PATCH] coreos-base/coreos-metadata: use $COREOS_METADATA_OPT_PROVIDER for ssh An earlier commit modified the coreos-metadata.service unit to use the COREOS_METADATA_OPT_PROVIDER environment variable to specify the provider for coreos-metadata. That commit failed to make the same change to the coreos-metadata-sshkeys@.service unit. This commit fixes this. --- .../coreos-metadata/files/coreos-metadata-sshkeys@.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service index 6090225250..4ee64ead05 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service @@ -3,7 +3,8 @@ Description=CoreOS Metadata Agent (SSH Keys) [Service] Type=oneshot -ExecStart=/usr/bin/coreos-metadata --cmdline --ssh-keys=%i +Environment=COREOS_METADATA_OPT_PROVIDER=--cmdline +ExecStart=/usr/bin/coreos-metadata ${COREOS_METADATA_OPT_PROVIDER} --ssh-keys=%i [Install] DefaultInstance=core