Merge pull request ceph#13197 from asheplyakov/master-18740

systemd/ceph-disk: make it possible to customize timeout Reviewed-by: Loic Dachary <[email protected]> Reviewed-by: Kefu Chai <[email protected]>
senax · Mar 24, 2017 · c52431b · c52431b
2 parents 6a771d1 + 22332f6
commit c52431b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/systemd/[email protected] b/systemd/[email protected]
@@ -6,5 +6,6 @@ Wants=local-fs.target
 [Service]
 Type=oneshot
 KillMode=none
-ExecStart=/bin/sh -c 'timeout 120 flock /var/lock/ceph-disk-$(basename %f) /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
+Environment=CEPH_DISK_TIMEOUT=300
+ExecStart=/bin/sh -c 'timeout $CEPH_DISK_TIMEOUT flock /var/lock/ceph-disk-$(basename %f) /usr/sbin/ceph-disk --verbose --log-stdout trigger --sync %f'
 TimeoutSec=0