diff options
| author | Scott Moser <smoser@brickies.net> | 2012-12-01 21:46:27 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2012-12-01 21:46:27 -0500 |
| commit | 974e76eab2e43718802c8ef845e6696637e46930 (patch) | |
| tree | 260834e06f80b45af06febe0dfbd16a8b9e71976 /cloudinit/config | |
| parent | d324a2cb0b10a4cd1b1b05dd23d0040ab3e9621c (diff) | |
| download | vyos-cloud-init-974e76eab2e43718802c8ef845e6696637e46930.tar.gz vyos-cloud-init-974e76eab2e43718802c8ef845e6696637e46930.zip | |
make sure no blank lines before cloud-init entry in ca-certificates.conf
when /etc/ca-certificates.conf is read by update-ca-certificates
lines after a blank line get ignored. Here, ensure that
there are no blank lines, and no duplicate entries for cloud-init are
added.
LP: #1077020
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_ca_certs.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cloudinit/config/cc_ca_certs.py b/cloudinit/config/cc_ca_certs.py index 20f24357..4f2a46a1 100644 --- a/cloudinit/config/cc_ca_certs.py +++ b/cloudinit/config/cc_ca_certs.py @@ -45,8 +45,15 @@ def add_ca_certs(certs): # First ensure they are strings... cert_file_contents = "\n".join([str(c) for c in certs]) util.write_file(CA_CERT_FULL_PATH, cert_file_contents, mode=0644) + # Append cert filename to CA_CERT_CONFIG file. - util.write_file(CA_CERT_CONFIG, "\n%s" % CA_CERT_FILENAME, omode="ab") + # We have to strip the content because blank lines in the file + # causes subsequent entries to be ignored. (LP: #1077020) + orig = util.load_file(CA_CERT_CONFIG) + cur_cont = '\n'.join([l for l in orig.splitlines() + if l != CA_CERT_FILENAME]) + out = "%s\n%s\n" % (cur_cont.rstrip(), CA_CERT_FILENAME) + util.write_file(CA_CERT_CONFIG, out, omode="wb") def remove_default_ca_certs(): |