From cfa17ca2d2605003685edd3af7303fe3e73a6caa Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Tue, 18 Mar 2014 10:36:34 -0700 Subject: [PATCH] fix(etcd): Place etcd.service drop-in in /run --- initialize/etcd.go | 2 +- initialize/etcd_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/initialize/etcd.go b/initialize/etcd.go index 7d945dd..a55be07 100644 --- a/initialize/etcd.go +++ b/initialize/etcd.go @@ -37,7 +37,7 @@ func (ec EtcdEnvironment) String() (out string) { // Write an EtcdEnvironment to the appropriate path on disk for etcd.service func WriteEtcdEnvironment(env EtcdEnvironment, root string) error { file := system.File{ - Path: path.Join(root, "etc", "systemd", "system", "etcd.service.d", "20-cloudinit.conf"), + Path: path.Join(root, "run", "systemd", "system", "etcd.service.d", "20-cloudinit.conf"), RawFilePermissions: "0644", Content: env.String(), } diff --git a/initialize/etcd_test.go b/initialize/etcd_test.go index 46655f3..f1c3e94 100644 --- a/initialize/etcd_test.go +++ b/initialize/etcd_test.go @@ -59,7 +59,7 @@ func TestEtcdEnvironmentWrittenToDisk(t *testing.T) { t.Fatalf("Processing of EtcdEnvironment failed: %v", err) } - fullPath := path.Join(dir, "etc", "systemd", "system", "etcd.service.d", "20-cloudinit.conf") + fullPath := path.Join(dir, "run", "systemd", "system", "etcd.service.d", "20-cloudinit.conf") fi, err := os.Stat(fullPath) if err != nil {