From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 4/4] ts-xen-install: networking: Rename `nodhcp' to `ensurebridge' Date: Thu, 10 Sep 2015 18:17:31 +0100 Message-ID: <1441905451-32518-5-git-send-email-ian.jackson@eu.citrix.com> References: <22001.45551.963251.380388@mariner.uk.xensource.com> <1441905451-32518-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Za5UA-0003uo-R3 for xen-devel@lists.xenproject.org; Thu, 10 Sep 2015 17:18:10 +0000 In-Reply-To: <1441905451-32518-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 The code that used to be in nodhcp replaced any existing dhcp configuration with a static one. What it does now is ensure that there is a bridge, without messing with how the network is configured. So rename the function. Signed-off-by: Ian Jackson --- ts-xen-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-xen-install b/ts-xen-install index ef26cba..69884a3 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); @@ -339,6 +339,6 @@ if ($checkmode) { adjustconfig(); setupboot(); setupinitd(); - nodhcp(); + ensurebridge(); hosts(); } -- 1.7.10.4