diff options
author | Adam King <47704447+adk3798@users.noreply.github.com> | 2025-01-13 19:17:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-13 19:17:09 +0100 |
commit | 71d50d80c9fff80026e3431e577476e4d099f0f1 (patch) | |
tree | 0075bb1c7aa8e644aabe22ab495647d3f9ce241e | |
parent | Merge pull request #61099 from rkachach/fix_issue_69252 (diff) | |
parent | mgr/cephadm: Restore client file(s) default SELinux context type (diff) | |
download | ceph-71d50d80c9fff80026e3431e577476e4d099f0f1.tar.xz ceph-71d50d80c9fff80026e3431e577476e4d099f0f1.zip |
Merge pull request #61208 from Yonatan-Zaken/restore_selinux_context_when_writing_remote_files_on_host
mgr/cephadm: Restore client file(s) default SELinux context type
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: John Mulligan <jmulligan@redhat.com>
-rw-r--r-- | src/pybind/mgr/cephadm/ssh.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pybind/mgr/cephadm/ssh.py b/src/pybind/mgr/cephadm/ssh.py index 1622cb001ab..acb5a77c51b 100644 --- a/src/pybind/mgr/cephadm/ssh.py +++ b/src/pybind/mgr/cephadm/ssh.py @@ -358,7 +358,7 @@ class SSHManager: await self._check_execute_command(host, chown, addr=addr) chmod = RemoteCommand(Executables.CHMOD, [oct(mode)[2:], tmp_path]) await self._check_execute_command(host, chmod, addr=addr) - mv = RemoteCommand(Executables.MV, [tmp_path, path]) + mv = RemoteCommand(Executables.MV, ['-Z', tmp_path, path]) await self._check_execute_command(host, mv, addr=addr) except Exception as e: msg = f"Unable to write {host}:{path}: {e}" |