summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-25 13:34:16 (GMT)
committerGerrit Code Review <gerrit@baserock.org>2015-03-25 13:34:16 (GMT)
commit066913272bfc19218516cf9f40e9e011afb03856 (patch)
treeafc9c63380723a80dcc2709fe76354febd6fb54c
parent2f8dd7c1f603799c1dfde512c9e160d8fb9d02f4 (diff)
parent6b31574c2df5d897818d7c414871fd7aff27d754 (diff)
downloadmorph-066913272bfc19218516cf9f40e9e011afb03856.tar.gz
Merge "simple-network: only try to rename "10-dhcp.network" if it actually exist"
-rwxr-xr-xmorphlib/exts/simple-network.configure14
1 files changed, 8 insertions, 6 deletions
diff --git a/morphlib/exts/simple-network.configure b/morphlib/exts/simple-network.configure
index 130b96c..1ba94e8 100755
--- a/morphlib/exts/simple-network.configure
+++ b/morphlib/exts/simple-network.configure
@@ -81,12 +81,14 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
"""
file_path = os.path.join(args[0], "etc", "systemd", "network",
"10-dhcp.network")
- try:
- os.rename(file_path, file_path + ".morph")
- self.status(msg="Renaming networkd file from systemd chunk: %(f)s \
- to %(f)s.morph", f=file_path)
- except OSError:
- pass
+
+ if os.path.isfile(file_path):
+ try:
+ os.rename(file_path, file_path + ".morph")
+ self.status(msg="Renaming networkd file from systemd chunk: \
+ %(f)s to %(f)s.morph", f=file_path)
+ except OSError:
+ pass
def generate_default_network_config(self, args):
"""Generate default network config: DHCP in all the interfaces"""