diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-06-10 12:30:02 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-06-10 12:30:02 -0400 |
| commit | 162ce6a5635574e8dba0be3e06d313a18b46adc6 (patch) | |
| tree | bdbd06e2ddee5c539ff826488a082d6d5f574a62 /cloudinit/distros/rhel.py | |
| parent | 0f3736ab501ceebaa3c9f5c7543b6218637cb6c7 (diff) | |
| parent | 8db399f9149a81de5d65f0759792766ecd509ab3 (diff) | |
| download | vyos-cloud-init-162ce6a5635574e8dba0be3e06d313a18b46adc6.tar.gz vyos-cloud-init-162ce6a5635574e8dba0be3e06d313a18b46adc6.zip | |
check for systemd using sd_booted() semantics
The existing code determines if systemd is in use by looking at the
distribution name and version. This is prone to error because:
- RHEL derivatives other than CentOS (e.g., Scientific Linux) will fail
this test
- Distributions that are not derived from RHEL also use systemd
This patch makes cloud-init use the same logic that is used in systemd's
sd_booted() method
http://www.freedesktop.org/software/systemd/man/sd_booted.html
LP: #1461201
Diffstat (limited to 'cloudinit/distros/rhel.py')
| -rw-r--r-- | cloudinit/distros/rhel.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py index 30c805a6..812e7002 100644 --- a/cloudinit/distros/rhel.py +++ b/cloudinit/distros/rhel.py @@ -111,14 +111,6 @@ class Distro(distros.Distro): rhel_util.update_sysconfig_file(self.network_conf_fn, net_cfg) return dev_names - def uses_systemd(self): - # Fedora 18 and RHEL 7 were the first adopters in their series - (dist, vers) = util.system_info()['dist'][:2] - major = (int)(vers.split('.')[0]) - return ((dist.startswith('Red Hat Enterprise Linux') and major >= 7) - or (dist.startswith('CentOS Linux') and major >= 7) - or (dist.startswith('Fedora') and major >= 18)) - def apply_locale(self, locale, out_fn=None): if self.uses_systemd(): if not out_fn: |