diff options
| author | Lars Kellogg-Stedman <lars@redhat.com> | 2017-04-10 15:52:37 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-12 11:20:27 -0400 |
| commit | 721348a622a660b65acfdf7fdf53203b47f80748 (patch) | |
| tree | 0b0f58342c8bc5cf5cfd1514095cb25b259f0052 /cloudinit/atomic_helper.py | |
| parent | 493f6c3e923902d5d4f3d87e1cc4c726ea90ada4 (diff) | |
| download | vyos-cloud-init-721348a622a660b65acfdf7fdf53203b47f80748.tar.gz vyos-cloud-init-721348a622a660b65acfdf7fdf53203b47f80748.zip | |
util: teach write_file about copy_mode option
On centos/fedora/rhel/derivatives, /etc/ssh/sshd_config has mode 0600,
but cloud-init unilaterally sets file modes to 0644 when no explicit
mode is passed to util.write_file. On ubuntu/debian, this file has
mode 0644. With this patch, write_file learns about the copy_mode
option, which will cause it to use the mode of the existing file by
default, falling back to the explicit mode parameter if the file does
not exist.
LP: #1644064
Resolves: rhbz#1295984
Diffstat (limited to 'cloudinit/atomic_helper.py')
| -rw-r--r-- | cloudinit/atomic_helper.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cloudinit/atomic_helper.py b/cloudinit/atomic_helper.py index fb2df8d5..587b9945 100644 --- a/cloudinit/atomic_helper.py +++ b/cloudinit/atomic_helper.py @@ -2,13 +2,23 @@ import json import os +import stat import tempfile _DEF_PERMS = 0o644 -def write_file(filename, content, mode=_DEF_PERMS, omode="wb"): +def write_file(filename, content, mode=_DEF_PERMS, + omode="wb", copy_mode=False): # open filename in mode 'omode', write content, set permissions to 'mode' + + if copy_mode: + try: + file_stat = os.stat(filename) + mode = stat.S_IMODE(file_stat.st_mode) + except OSError: + pass + tf = None try: tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(filename), |