diff options
| author | Sage Weil <sage@newdream.net> | 2021-01-22 12:33:52 -0600 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2021-01-22 12:33:52 -0600 |
| commit | 3d7761bd59b8e5ebac1d9a136d020f0f8d2eaf32 (patch) | |
| tree | 057e6d2a641727372092fb0ab4274a3a4e679352 | |
| parent | 8db0dc8e097276c1cd92aa87ec19482de8ac29bb (diff) | |
| parent | ce4743f72e6c7eea9514b8c9b6c20309fea5d455 (diff) | |
| download | ceph-3d7761bd59b8e5ebac1d9a136d020f0f8d2eaf32.tar.gz | |
Merge PR #39003 into masterv17.0.0
* refs/pull/39003/head:
cephadm: fix 2> syntax in unit.run
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
| -rwxr-xr-x | src/cephadm/cephadm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 4e61f7f8b9a..b2084e24240 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -2505,10 +2505,10 @@ def _write_container_cmd_to_bash(ctx, file_obj, container, comment=None, backgro # unit file, makes it easier to read and grok. file_obj.write('# ' + comment + '\n') # Sometimes, adding `--rm` to a run_cmd doesn't work. Let's remove the container manually - file_obj.write('! '+ ' '.join(container.rm_cmd()) + '2> /dev/null\n') + file_obj.write('! '+ ' '.join(container.rm_cmd()) + ' 2> /dev/null\n') # Sometimes, `podman rm` doesn't find the container. Then you'll have to add `--storage` if 'podman' in ctx.container_path: - file_obj.write('! '+ ' '.join(container.rm_cmd(storage=True)) + '2> /dev/null\n') + file_obj.write('! '+ ' '.join(container.rm_cmd(storage=True)) + ' 2> /dev/null\n') # container run command file_obj.write(' '.join(container.run_cmd()) + (' &' if background else '') + '\n') |