diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-24 17:41:56 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2012-09-24 17:41:56 -0700 |
| commit | ebd83a036cd94d856c2cd100202c6fb4ca287ce1 (patch) | |
| tree | 2502a4464ae60d5a821ed9040f13241e8dce284b /cloudinit/distros/rhel.py | |
| parent | f59369d1bb0eac874dcd2fa91abfad9186b22810 (diff) | |
| parent | 314530b519814af4b19b4f7cbcb9a35a6cd68e2d (diff) | |
| download | vyos-cloud-init-ebd83a036cd94d856c2cd100202c6fb4ca287ce1.tar.gz vyos-cloud-init-ebd83a036cd94d856c2cd100202c6fb4ca287ce1.zip | |
Bring up to date with trunk.
Diffstat (limited to 'cloudinit/distros/rhel.py')
| -rw-r--r-- | cloudinit/distros/rhel.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 1ea7952b..67d80bf4 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -144,6 +144,8 @@ class Distro(distros.Distro): if not exists: lines.insert(0, _make_header()) util.write_file(fn, "\n".join(lines), 0644) +======= +>>>>>>> MERGE-SOURCE def set_hostname(self, hostname): self._write_hostname(hostname, '/etc/sysconfig/network') |