From f456e58355eb21ce6e259abbfdb7965ab7f4e100 Mon Sep 17 00:00:00 2001
From: Jonathan Wills <runningwild@gmail.com>
Date: Sat, 8 Aug 2015 11:16:47 -0400
Subject: [PATCH] Install rkt to a directory that doesn't require environment
 variables to find.

Systemd doesn't do variable substitution on the name of the command to run, so we have to install
rkt to a directory with an absolute literal path that we can reference with environment variables.
---
 cluster/gce/coreos/node.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml
index 0ec352965d5..984624b0615 100644
--- a/cluster/gce/coreos/node.yaml
+++ b/cluster/gce/coreos/node.yaml
@@ -91,11 +91,13 @@ coreos:
         [Service]
         Type=oneshot
         EnvironmentFile=/etc/kube-env
+        ExecStartPre=/usr/bin/rm -rf /opt/rkt
         ExecStartPre=/usr/bin/mkdir -p /opt/rkt
         ExecStartPre=/usr/bin/wget \
         -O /opt/rkt/rkt-v${RKT_VERSION}.tar.gz \
         https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
-        ExecStart=/usr/bin/tar xzvf /opt/rkt/rkt-v${RKT_VERSION}.tar.gz -C /opt --overwrite
+        ExecStartPre=/usr/bin/tar xzvf /opt/rkt/rkt-v${RKT_VERSION}.tar.gz -C /opt --overwrite
+        ExecStart=/usr/bin/mv /opt/rkt-v${RKT_VERSION} /opt/rkt/rkt
 
     - name: kubernetes-install-minion.service
       command: start
@@ -200,4 +202,4 @@ coreos:
         After=kubernetes-install-rkt.service
         [Service]
         EnvironmentFile=/etc/kube-env
-        ExecStart=/opt/rkt-v${RKT_VERSION}/rkt metadata-service
+        ExecStart=/opt/rkt/rkt metadata-service