From 94b95fc433833197da2e94bb207c61ccc9f22cdc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E7=8E=AE=E6=96=87?= Date: Wed, 7 Apr 2021 21:18:52 +0800 Subject: [PATCH] cephadm: cleanup extra slash in runtime dir MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit %t already contains a slash, no need to add an extra one Signed-off-by: 胡玮文 (cherry picked from commit 9a864f086bedb7098060637ffb27ccc5dc92a88b) --- src/cephadm/cephadm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 67a060c2842a5..25c4be5437bc5 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2991,10 +2991,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' -- 2.39.5