From f9180c9b0951420b052871bd7bb21082ce1e660e Mon Sep 17 00:00:00 2001 From: Wesley Wiedenmeier Date: Wed, 16 Mar 2016 13:39:47 -0500 Subject: 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 --- cloudinit/distros/debian.py | 1 + 1 file changed, 1 insertion(+) 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 [] -- cgit v1.2.3