From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 08/12] ts-guests-nbd-mirror: purge old
	packages first
Date: Tue, 11 Feb 2014 15:25:50 +0000
Message-ID: <1392132354-7594-9-git-send-email-ian.jackson@eu.citrix.com>
References: <1392132354-7594-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: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta4.messagelabs.com ([85.158.143.247])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Jackson@citrix.com>) id 1WDFDy-00080p-K7
	for xen-devel@lists.xenproject.org; Tue, 11 Feb 2014 15:26:14 +0000
In-Reply-To: <1392132354-7594-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

Purge any old nbd-client and nbd-server _before_ we make their config.

This only has any effect if the packages are installed before this
script starts, which isn't the case in any of the automatically-run
recipes.  But it can occur when the script is being tested by hand.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 ts-guests-nbd-mirror |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ts-guests-nbd-mirror b/ts-guests-nbd-mirror
index 89508dd..c0a021a 100755
--- a/ts-guests-nbd-mirror
+++ b/ts-guests-nbd-mirror
@@ -52,6 +52,8 @@ sub findvols () {
 }
 
 sub configserver () {
+    target_cmd_root($sho, "dpkg --purge nbd-server ||:");
+
     my $scfg= <<END;
 # generated by $0
 [generic]
@@ -67,7 +69,6 @@ END
 END
     }
 
-    target_cmd_root($sho, "dpkg --purge nbd-server ||:");
     target_cmd_root($sho, "mkdir -p /etc/nbd-server");
     target_putfilecontents_root_stash($sho,10, $scfg,
         "/etc/nbd-server/config", "${srvhost}_nbd-server_config");
@@ -75,6 +76,8 @@ END
 }
 
 sub configclient () {
+    target_cmd_root($cho, "dpkg --purge nbd-client ||:");
+
     my $mydaemon= '/root/nbd-client-async';
     target_putfilecontents_root_stash($cho,10,<<'END',$mydaemon);
 #!/bin/sh
@@ -99,7 +102,6 @@ NBD_HOST[$v->{Ix}]=$sho->{Name}
 NBD_PORT[$v->{Ix}]=$v->{Port}
 END
     }
-    target_cmd_root($cho, "dpkg --purge nbd-client ||:");
     target_putfilecontents_root_stash($cho,10,$ccfg,"/etc/nbd-client");
     target_install_packages($cho, qw(nbd-client));
 }
-- 
1.7.10.4