diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-09-24 17:53:15 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-09-24 17:53:30 -0700 |
| commit | fe81ebff670ff16591084df5d04184b6912f40bf (patch) | |
| tree | bd9d0682369779d359206a03fa3596a81da6a302 /sys-cluster/ceph/files | |
| parent | dev-lang/erlang: drop old (diff) | |
| download | gentoo-fe81ebff670ff16591084df5d04184b6912f40bf.tar.gz gentoo-fe81ebff670ff16591084df5d04184b6912f40bf.tar.bz2 gentoo-fe81ebff670ff16591084df5d04184b6912f40bf.zip | |
sys-cluster/ceph: Revbumps, fix for systemd units (bug #604328)
Closes: https://bugs.gentoo.org/604328
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'sys-cluster/ceph/files')
| -rw-r--r-- | sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch | 27 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch | 27 |
2 files changed, 54 insertions, 0 deletions
diff --git a/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch new file mode 100644 index 000000000000..7309fea029e1 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.11-systemd-unit-fix.patch @@ -0,0 +1,27 @@ +From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001 +From: Jan Fajerski <jfajerski@suse.com> +Date: Fri, 12 Jun 2020 09:27:36 +0200 +Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in + /usr/libexec + +Fixes: https://tracker.ceph.com/issues/45984 +Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29 + +Signed-off-by: Jan Fajerski <jfajerski@suse.com> +--- + systemd/ceph-osd@.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in +index a0067d347220..4a2254e99478 100644 +--- a/systemd/ceph-osd@.service.in ++++ b/systemd/ceph-osd@.service.in +@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph + EnvironmentFile=-@SYSTEMD_ENV_FILE@ + Environment=CLUSTER=ceph + ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph +-ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i ++ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i + ExecReload=/bin/kill -HUP $MAINPID + LockPersonality=true + MemoryDenyWriteExecute=true diff --git a/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch new file mode 100644 index 000000000000..a127ada181f2 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-15.2.5-systemd-unit-fix.patch @@ -0,0 +1,27 @@ +From bd8b8540f6b67a25585ca9cf140d6de760bc2a43 Mon Sep 17 00:00:00 2001 +From: Jan Fajerski <jfajerski@suse.com> +Date: Fri, 12 Jun 2020 09:27:36 +0200 +Subject: [PATCH] systemd/ceph-osd: ceph-osd-prestart.sh now lives in + /usr/libexec + +Fixes: https://tracker.ceph.com/issues/45984 +Fixes: ed6552d5067c9f1d34c426f9ae18b0c37f2a9d29 + +Signed-off-by: Jan Fajerski <jfajerski@suse.com> +--- + systemd/ceph-osd@.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/systemd/ceph-osd@.service.in b/systemd/ceph-osd@.service.in +index a0067d347220..4a2254e99478 100644 +--- a/systemd/ceph-osd@.service.in ++++ b/systemd/ceph-osd@.service.in +@@ -9,7 +9,7 @@ Environment=CLUSTER=ceph + EnvironmentFile=-@SYSTEMD_ENV_FILE@ + Environment=CLUSTER=ceph + ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph +-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i ++ExecStartPre=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i + ExecReload=/bin/kill -HUP $MAINPID + LockPersonality=true + MemoryDenyWriteExecute=true |