summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-03-31 13:58:41 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-03-31 16:18:05 (GMT)
commit4b86588589b909bb6ea4bdfe275b8a34ae7ae74d (patch)
tree3a0ed3d48319460f6427906e044268da34ace566
parent4c76bf1d6ed7c7a464de475825b142d89012b3d2 (diff)
downloaddefinitions-4b86588589b909bb6ea4bdfe275b8a34ae7ae74d.tar.gz
Don't install systemd units as executable
systemd warns about executable unit files. E.G. "Configuration file /usr/lib/systemd/system/rsync.service is marked executable. Please remove executable permission bits. Proceeding anyway." Change-Id: I47721d7a78d6bbe87ebc171ff9b35db293d37e23
-rw-r--r--distbuild/manifest14
-rw-r--r--strata/bsp-jetson/bsp-support.morph2
-rw-r--r--strata/ceph-service/ceph.morph8
-rw-r--r--strata/databases/memcached.morph2
-rw-r--r--strata/foundation/rsync.morph2
5 files changed, 14 insertions, 14 deletions
diff --git a/distbuild/manifest b/distbuild/manifest
index 3504702..9363fa8 100644
--- a/distbuild/manifest
+++ b/distbuild/manifest
@@ -10,14 +10,14 @@
0100644 0 0 /usr/lib/distbuild-setup/ansible/distbuild-setup.yml
0040755 0 0 /usr/lib/systemd
0040755 0 0 /usr/lib/systemd/system
-0100755 0 0 /usr/lib/systemd/system/morph-cache-server.service
-0100755 0 0 /usr/lib/systemd/system/morph-controller.service
-0100755 0 0 /usr/lib/systemd/system/morph-controller-helper.service
-0100755 0 0 /usr/lib/systemd/system/morph-worker.service
-0100755 0 0 /usr/lib/systemd/system/morph-worker-helper.service
-0100755 0 0 /usr/lib/systemd/system/distbuild-setup.service
+0100644 0 0 /usr/lib/systemd/system/morph-cache-server.service
+0100644 0 0 /usr/lib/systemd/system/morph-controller.service
+0100644 0 0 /usr/lib/systemd/system/morph-controller-helper.service
+0100644 0 0 /usr/lib/systemd/system/morph-worker.service
+0100644 0 0 /usr/lib/systemd/system/morph-worker-helper.service
+0100644 0 0 /usr/lib/systemd/system/distbuild-setup.service
0040755 0 0 /usr/lib/systemd/system/multi-user.target.wants
-0120755 0 0 /usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service
+0120644 0 0 /usr/lib/systemd/system/multi-user.target.wants/distbuild-setup.service
0040755 0 0 /usr/share
0040755 0 0 /usr/share/distbuild-setup
0100644 0 0 /usr/share/distbuild-setup/morph.conf
diff --git a/strata/bsp-jetson/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph
index 23524ac..5adb02e 100644
--- a/strata/bsp-jetson/bsp-support.morph
+++ b/strata/bsp-jetson/bsp-support.morph
@@ -1,6 +1,6 @@
name: bsp-support
kind: chunk
install-commands:
-- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
+- install -o 0 -g 0 -m 644 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph
index 9bb038d..a6b0675 100644
--- a/strata/ceph-service/ceph.morph
+++ b/strata/ceph-service/ceph.morph
@@ -10,10 +10,10 @@ install-commands:
- make install
- install -D -m 755 src/init-ceph.in "$DESTDIR"/etc/init.d/ceph-SysV
- install -D -m 755 systemd/ceph "$DESTDIR"/etc/systemd/system/ceph
-- install -D -m 755 systemd/ceph-mon@.service "$DESTDIR"/etc/systemd/system/ceph-mon@.service
-- install -D -m 755 systemd/ceph-osd@.service "$DESTDIR"/etc/systemd/system/ceph-osd@.service
-- install -D -m 755 systemd/ceph-mds@.service "$DESTDIR"/etc/systemd/system/ceph-mds@.service
-- install -D -m 755 systemd/ceph.target "$DESTDIR"/etc/systemd/system/ceph.target
+- install -D -m 644 systemd/ceph-mon@.service "$DESTDIR"/etc/systemd/system/ceph-mon@.service
+- install -D -m 644 systemd/ceph-osd@.service "$DESTDIR"/etc/systemd/system/ceph-osd@.service
+- install -D -m 644 systemd/ceph-mds@.service "$DESTDIR"/etc/systemd/system/ceph-mds@.service
+- install -D -m 644 systemd/ceph.target "$DESTDIR"/etc/systemd/system/ceph.target
- install -d "$DESTDIR"/etc/ceph
- install -D -d "$DESTDIR"/var/lib/ceph
- install -d "$DESTDIR"/var/lib/ceph/mon
diff --git a/strata/databases/memcached.morph b/strata/databases/memcached.morph
index f1cb287..e81a8be 100644
--- a/strata/databases/memcached.morph
+++ b/strata/databases/memcached.morph
@@ -8,7 +8,7 @@ configure-commands:
- ./configure --prefix="$PREFIX"
install-commands:
- make install
-- install -D -m 755 scripts/memcached.service "$DESTDIR$PREFIX"/lib/systemd/system/memcached.service
+- install -D -m 644 scripts/memcached.service "$DESTDIR$PREFIX"/lib/systemd/system/memcached.service
post-install-commands:
- mkdir -p "$DESTDIR"/etc/sysconfig
- |
diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph
index fb10f94..5433741 100644
--- a/strata/foundation/rsync.morph
+++ b/strata/foundation/rsync.morph
@@ -6,4 +6,4 @@ build-commands:
- make
install-commands:
- make install
-- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service
+- install -D -m 644 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service