diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-24 15:50:40 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-24 18:37:38 +0000 |
| commit | b897f9d6b0ab5c634e509b4ff28df2cc21a64538 (patch) | |
| tree | c7a3e06f9081b083be79df88fbd08ab95c7bc587 | |
| parent | 0c6570606101becb4709a7f985941c58535b9a4d (diff) | |
| download | definitions-b897f9d6b0ab5c634e509b4ff28df2cc21a64538.tar.gz | |
cloud-init: usrmerge
| -rwxr-xr-x | cloud-init.configure | 2 | ||||
| -rw-r--r-- | strata/cloudinit-support/cloud-init.morph | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cloud-init.configure b/cloud-init.configure index aa83e0e2..0d33e34b 100755 --- a/cloud-init.configure +++ b/cloud-init.configure @@ -49,7 +49,7 @@ cloud_init_services="cloud-config.service # into /etc/systemd/system/multi-user.target.wants. # If the services to link are not present, fail. -services_folder="lib/systemd/system" +services_folder="usr/lib/systemd/system" for service_name in $cloud_init_services; do if [ ! -f "$ROOT/$services_folder/$service_name" ]; then echo "ERROR: Service $service_name is missing." >&2 diff --git a/strata/cloudinit-support/cloud-init.morph b/strata/cloudinit-support/cloud-init.morph index 5933dbf8..2af03873 100644 --- a/strata/cloudinit-support/cloud-init.morph +++ b/strata/cloudinit-support/cloud-init.morph @@ -2,5 +2,5 @@ name: cloud-init kind: chunk build-system: python-distutils post-install-commands: -- mkdir -p "$DESTDIR"/lib/systemd/system -- cp systemd/* "$DESTDIR"/lib/systemd/system/ +- mkdir -p "$DESTDIR$PREFIX"/lib/systemd/system +- cp systemd/* "$DESTDIR$PREFIX"/lib/systemd/system/ |