summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-25 13:34:05 (GMT)
committerGerrit Code Review <gerrit@baserock.org>2015-03-25 13:34:05 (GMT)
commit51fd71bceb68ed4a24d2e587a9e5ff3345de624c (patch)
tree525489274900395958476473417908c4fc078637
parent966634f677af417e310512e547c1d5f7d05c7bbd (diff)
parent65e9f6f45c669b186eee004ce1cd676b8dd434ae (diff)
downloadmorph-51fd71bceb68ed4a24d2e587a9e5ff3345de624c.tar.gz
Merge "simple-network: separate creation of directory and file path"
-rwxr-xr-xmorphlib/exts/simple-network.configure12
1 files changed, 8 insertions, 4 deletions
diff --git a/morphlib/exts/simple-network.configure b/morphlib/exts/simple-network.configure
index 6111332..42bf1b8 100755
--- a/morphlib/exts/simple-network.configure
+++ b/morphlib/exts/simple-network.configure
@@ -106,7 +106,10 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
"""Generate /etc/network/interfaces file"""
iface_file = self.generate_iface_file(stanzas)
- with open(os.path.join(args[0], "etc/network/interfaces"), "w") as f:
+
+ directory_path = os.path.join(args[0], "etc", "network")
+ file_path = os.path.join(directory_path, "interfaces")
+ with open(file_path, "w") as f:
f.write(iface_file)
def generate_iface_file(self, stanzas):
@@ -147,10 +150,11 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
if iface_file is None:
continue
- path = os.path.join(args[0], "etc", "systemd", "network",
- "%s-%s.network" % (i, stanza['name']))
+ directory_path = os.path.join(args[0], "etc", "systemd", "network")
+ file_path = os.path.join(directory_path,
+ "%s-%s.network" % (i, stanza['name']))
- with open(path, "w") as f:
+ with open(file_path, "w") as f:
f.write(iface_file)
def generate_networkd_file(self, stanza):