From: James Page Date: Tue, 5 Apr 2016 15:58:58 +0000 (+0100) Subject: Drop --setuser/--setgroup from osd prestart X-Git-Tag: v11.0.0~858^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74977f78840fe95b67788f3aa135ac69a2353c43;p=ceph.git Drop --setuser/--setgroup from osd prestart These are not supported by /usr/lib/ceph/ceph-osd-prestart.sh, resulting in warnings: ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setuser' ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setgroup' --setuser and --setgroup are only needed for the ceph-osd process. Signed-off-by: James Page --- diff --git a/systemd/ceph-osd@.service b/systemd/ceph-osd@.service index 0d73afbbbf22..0fa8f0b76bf5 100644 --- a/systemd/ceph-osd@.service +++ b/systemd/ceph-osd@.service @@ -10,7 +10,7 @@ LimitNPROC=1048576 EnvironmentFile=-/etc/sysconfig/ceph 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 --setuser ceph --setgroup ceph +ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i ExecReload=/bin/kill -HUP $MAINPID ProtectHome=true ProtectSystem=full