diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-16 13:39:47 -0500 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-03-16 13:39:47 -0500 |
| commit | f9180c9b0951420b052871bd7bb21082ce1e660e (patch) | |
| tree | 1bf85e3858304536014ddf6b6336d6e3bdab88fd /cloudinit | |
| parent | 14c88d8c28a044776d011ed507f8f6465ec3e2c7 (diff) | |
| download | vyos-cloud-init-f9180c9b0951420b052871bd7bb21082ce1e660e.tar.gz vyos-cloud-init-f9180c9b0951420b052871bd7bb21082ce1e660e.zip | |
In distros.debian call net.merge_from_cmdline_config to ensure that the results
from any ip= parameters passed on the kernel cmdline are merged into network
state
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/distros/debian.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py index 909d6deb..c7a4ba07 100644 --- a/cloudinit/distros/debian.py +++ b/cloudinit/distros/debian.py @@ -79,6 +79,7 @@ class Distro(distros.Distro): def _write_network_config(self, netconfig): ns = net.parse_net_config_data(netconfig) + ns = net.merge_from_cmdline_config(ns) net.render_network_state(network_state=ns, target="/") return [] |