]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: absolute path for /bin/install 31319/head
authorSage Weil <sage@redhat.com>
Fri, 1 Nov 2019 15:22:50 +0000 (10:22 -0500)
committerSage Weil <sage@redhat.com>
Fri, 1 Nov 2019 15:24:23 +0000 (10:24 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon

index 39517b1b7f1fc3bfc1e4dd69a91f39bef196f4eb..659f2522cb84fef4fa1d7ba5b9b55f7b22d89ec0 100755 (executable)
@@ -626,6 +626,7 @@ def deploy_crash(fsid, uid, gid, config, keyring):
     subprocess.check_output(['systemctl', 'start', unit_name])
 
 def get_unit_file(fsid, uid, gid):
+    install_path = find_program('install')
     u = """[Unit]
 Description=Ceph daemon for {fsid}
 
@@ -644,7 +645,7 @@ LimitNOFILE=1048576
 LimitNPROC=1048576
 EnvironmentFile=-/etc/environment
 ExecStartPre=-{podman_path} rm ceph-{fsid}-%i
-ExecStartPre=-install -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid}
+ExecStartPre=-{install_path} -d -m0770 -o {uid} -g {gid} /var/run/ceph/{fsid}
 ExecStart=/bin/bash {data_dir}/{fsid}/%i/cmd
 ExecStop=-{podman_path} stop ceph-{fsid}-%i
 Restart=on-failure
@@ -658,6 +659,7 @@ StartLimitBurst=5
 WantedBy=ceph-{fsid}.target
 """.format(
     podman_path=podman_path,
+    install_path=install_path,
     fsid=fsid,
     uid=uid,
     gid=gid,