From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 26/26] ts-xen-install: networking: Rename `nodhcp' to `ensurebridge' Date: Fri, 25 Sep 2015 20:15:22 +0100 Message-ID: <1443208522-24905-18-git-send-email-ian.jackson@eu.citrix.com> References: <1443181028-22705-1-git-send-email-ian.jackson@eu.citrix.com> <1443208522-24905-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfYTZ-0001gb-Kj for xen-devel@lists.xenproject.org; Fri, 25 Sep 2015 19:16:09 +0000 In-Reply-To: <1443208522-24905-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Robert Ho , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org 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 --- 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