]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: cleanup extra slash in runtime dir 40644/head
author胡玮文 <huww98@outlook.com>
Wed, 7 Apr 2021 13:18:52 +0000 (21:18 +0800)
committer胡玮文 <huww98@outlook.com>
Wed, 7 Apr 2021 13:25:10 +0000 (21:25 +0800)
%t already contains a slash, no need to add an extra one

Signed-off-by: 胡玮文 <huww98@outlook.com>
src/cephadm/cephadm

index c9b7e768044965ffe867bd62aa6e84aa2789201d..9597aec2f756fc3b9dae63466fa83cee46677d37 100755 (executable)
@@ -2978,10 +2978,10 @@ def get_unit_file(ctx, fsid):
     # type: (CephadmContext, str) -> str
     extra_args = ''
     if isinstance(ctx.container_engine, Podman):
-        extra_args = ('ExecStartPre=-/bin/rm -f /%t/%n-pid /%t/%n-cid\n'
-                      'ExecStopPost=-/bin/rm -f /%t/%n-pid /%t/%n-cid\n'
+        extra_args = ('ExecStartPre=-/bin/rm -f %t/%n-pid %t/%n-cid\n'
+                      'ExecStopPost=-/bin/rm -f %t/%n-pid %t/%n-cid\n'
                       'Type=forking\n'
-                      'PIDFile=/%t/%n-pid\n')
+                      'PIDFile=%t/%n-pid\n')
         if ctx.container_engine.version >= CGROUPS_SPLIT_PODMAN_VERSION:
             extra_args += 'Delegate=yes\n'