]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: systemd ceph-disk unit must not assume /bin/flock 6803/head
authorLoic Dachary <ldachary@redhat.com>
Fri, 4 Dec 2015 20:11:09 +0000 (21:11 +0100)
committerLoic Dachary <ldachary@redhat.com>
Fri, 4 Dec 2015 20:11:09 +0000 (21:11 +0100)
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 <loic@dachary.org>
systemd/ceph-disk@.service

index cff7e9fbc4a25485493ff90255c809b67abd4822..8b18ba4349de17ff2c7d07367ca0cf903734f09f 100644 (file)
@@ -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