summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2016-06-06 18:45:55 -0700
committerJoshua Harlow <harlowja@gmail.com>2016-06-06 18:45:55 -0700
commit600ce494084368c511848c00fff7220255b14e6b (patch)
tree0e9ef9f9f3e0bc837e5516f2feb4dee16fde30e1 /cloudinit
parentf640797e342b6efbfb838a6350b312935222e992 (diff)
downloadvyos-cloud-init-600ce494084368c511848c00fff7220255b14e6b.tar.gz
vyos-cloud-init-600ce494084368c511848c00fff7220255b14e6b.zip
Get cmdline working again
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/net/cmdline.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 39523be2..187f7026 100644
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -24,7 +24,6 @@ import shlex
from . import compat
from . import get_devicelist
-from . import read_file
from . import sys_netdev_info
from cloudinit import util
@@ -136,7 +135,7 @@ def config_from_klibc_net_cfg(files=None, mac_addrs=None):
entries = []
names = {}
for cfg_file in files:
- name, entry = _klibc_to_config_entry(read_file(cfg_file),
+ name, entry = _klibc_to_config_entry(util.load_file(cfg_file),
mac_addrs=mac_addrs)
if name in names:
raise ValueError(