From 4c3468985d93929df4e9486b2e68938806fbfa1b Mon Sep 17 00:00:00 2001 From: Wesley Wiedenmeier Date: Mon, 21 Mar 2016 23:41:47 -0500 Subject: Fix typo in disable_conf_file and mistake in call --- cloudinit/distros/debian.py | 2 +- cloudinit/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 18d5d124..38d22d85 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -84,7 +84,7 @@ class Distro(distros.Distro): def _write_network_fallback(self): # old fallback configuration is obsolete, disable it - util.disable_cfg_file('/etc/network/interfaces.d/eth0.cfg') + util.disable_conf_file('/etc/network/interfaces.d/eth0.cfg') (ns, link_file, syslink_name) = net.find_fallback_network_device() if link_file is not None: util.write_file(syslink_name, link_file) diff --git a/cloudinit/util.py b/cloudinit/util.py index fa3a6163..58ab3c75 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -853,7 +853,7 @@ def disable_conf_file(conf): # disable .cfg file by renaming it if it exists if not os.path.exists(conf): return None - target_path = os.path.join(conf, '.disabled') + target_path = conf + '.disabled' rename(conf, target_path) return target_path -- cgit v1.2.3