This function does not (now) always undo the DHCP configuration. Sometimes it leaves it. Its main function is to ensure that we have a bridge for use by guests.
So rename the function. Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com> Tested-by: Robert Ho <robert...@intel.com> --- v14: This patch was previously 4/4 of a miniature series containing a different way of dealing with the Nested HVM L1 DHCP problem. --- ts-xen-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-xen-install b/ts-xen-install index d9aa694..3d0f394 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -247,7 +247,7 @@ sub hosts () { }); } -sub nodhcp () { +sub ensurebridge () { target_editfile_root($ho, "/etc/network/interfaces", "etc-network-interfaces", sub { my $physif= get_host_property($ho,'interface force',undef); @@ -370,6 +370,6 @@ if ($checkmode) { adjustconfig(); setupboot(); setupinitd(); - nodhcp(); + ensurebridge(); hosts(); } -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel