From: Loic Dachary Date: Fri, 4 Dec 2015 20:11:09 +0000 (+0100) Subject: build/ops: systemd ceph-disk unit must not assume /bin/flock X-Git-Tag: v10.0.2~95^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6803%2Fhead;p=ceph.git build/ops: systemd ceph-disk unit must not assume /bin/flock The flock command may be installed elsewhere, depending on the system. Let the PATH search figure that out. http://tracker.ceph.com/issues/13975 Fixes: #13975 Signed-off-by: Loic Dachary --- diff --git a/systemd/ceph-disk@.service b/systemd/ceph-disk@.service index cff7e9fbc4a2..8b18ba4349de 100644 --- a/systemd/ceph-disk@.service +++ b/systemd/ceph-disk@.service @@ -4,5 +4,5 @@ Description=Ceph disk activation: %f [Service] Type=oneshot KillMode=none -ExecStart=/bin/flock /var/lock/ceph-disk -c '/usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f' +ExecStart=/bin/sh -c 'flock /var/lock/ceph-disk /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f' TimeoutSec=0