From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 2/4] ts-xen-install: networking: Bail if we expected a bridge but there wasn't one Date: Thu, 10 Sep 2015 18:17:29 +0100 Message-ID: <1441905451-32518-3-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 1Za5U9-0003uJ-Vw 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 If we have been told that there should already be a bridge, but there isn't one, we would previously rewrite the networking config just in case (mainly to make it static). Instead, quit the /e/n/i editing in this case. Signed-off-by: Ian Jackson --- ts-xen-install | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ts-xen-install b/ts-xen-install index 433a6d3..b148163 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -285,17 +285,15 @@ sub nodhcp () { } my ($iface,$bridgex); - if ($initscripts_nobridge) { - $iface= 'xenbr0'; - $bridgex= <