From patchwork Tue Oct 31 13:51:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10034601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9221E602B9 for ; Tue, 31 Oct 2017 14:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 44EA3286D2 for ; Tue, 31 Oct 2017 14:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39D1C28AD6; Tue, 31 Oct 2017 14:00:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B3629286D2 for ; Tue, 31 Oct 2017 14:00:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9X3g-0003QB-E7; Tue, 31 Oct 2017 13:58:24 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9X3f-0003Pe-H7 for xen-devel@lists.xenproject.org; Tue, 31 Oct 2017 13:58:23 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 5B/7C-29911-F7188F95; Tue, 31 Oct 2017 13:58:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprKIsWRWlGSWpSXmKPExsXitHSDvW5N449 Ig2+vOSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1owJW7wKHghVHD65nr2BcTt/FyMnh4SAv8TK 6+dYQWw2AWWJn529bCC2iICeRNOB54wgNrOAnUTzow8sILawQKDE6jO97CA2i4CqxL5Fu8Hqe QUsJRZMOscCMVNeYlfbRbCZnEDx9U+bwOqFBCwk7i37zghhK0h0TD/GBNErKHFy5hMWiF0SEg dfvGCewMg7C0lqFpLUAkamVYzqxalFZalFuoZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV 6yfm5mxiBgcMABDsYdz53OsQoycGkJMq70/F7pBBfUn5KZUZicUZ8UWlOavEhRhkODiUJXoeG H5FCgkWp6akVaZk5wBCGSUtw8CiJ8B4GSfMWFyTmFmemQ6ROMRpzdNy8+4eJ49nM1w3MQix5+ XmpUuK8j0BKBUBKM0rz4AbBYusSo6yUMC8j0GlCPAWpRbmZJajyrxjFORiVhHldQabwZOaVwO 17BXQKE9ApXhJgp5QkIqSkGhgn1AvFfnl/feuxmbW738kIKrKfW/Ba5vs/nwijUJV3KVaCes9 clLtz1m1gbHI5sc6wsuZYperZ/RPvRVS0vZ8y29Kr97qHlvavbO0JJ1/P49FcwK524v7qhX+8 SufM+z2tYdPXh7xZRxI0LSJiXka/tngyXUN/y/yo1SfX6v+uqS/dzeUw87+XEktxRqKhFnNRc SIAbH7ttKgCAAA= X-Env-Sender: prvs=470789eaf=wei.liu2@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1509458298!73901128!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19999 invoked from network); 31 Oct 2017 13:58:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 31 Oct 2017 13:58:19 -0000 X-IronPort-AV: E=Sophos;i="5.44,324,1505779200"; d="scan'208";a="457036567" From: Wei Liu To: Xen-devel Date: Tue, 31 Oct 2017 13:51:58 +0000 Message-ID: <20171031135203.11537-15-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171031135203.11537-1-wei.liu2@citrix.com> References: <20171031135203.11537-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, Wei Liu Subject: [Xen-devel] [OSSTEST PATCH v2 14/19] ts-guests-nbd-mirror: make it work with stretch X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On the server side, only add oldstyle= and port= on Wheezy and Jessie. Stretch doesn't support or need those anymore. On the client side, generate new style configuration file. Signed-off-by: Wei Liu --- ts-guests-nbd-mirror | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/ts-guests-nbd-mirror b/ts-guests-nbd-mirror index 3032204..7bcc02c 100755 --- a/ts-guests-nbd-mirror +++ b/ts-guests-nbd-mirror @@ -60,15 +60,19 @@ sub configserver () { [generic] user = root END - $scfg .= <{Suite} =~ m/sarge|lenny|squeeze/; + + $scfg .= <{Suite} =~ m/wheezy|jessie/; oldstyle = true END + foreach my $v (@vols) { $v->{Port}= unique_incrementing_runvar("${srvhost}_nextport",4000); $v->{Path}= "/dev/$v->{Gho}{Vg}/$v->{Lv}"; $scfg.=<{Ix}] exportname = $v->{Path} +END + $scfg.=<{Suite} =~ m/wheezy|jessie/; port = $v->{Port} END } @@ -79,9 +83,7 @@ END target_install_packages($sho, qw(nbd-server)); } -sub configclient () { - target_cmd_root($cho, "dpkg --purge nbd-client ||:"); - +sub configclient_pre_stretch () { my $mydaemon= '/root/nbd-client-async'; target_putfilecontents_root_stash($cho,10,<<'END',$mydaemon); #!/bin/sh @@ -107,7 +109,44 @@ NBD_PORT[$v->{Ix}]=$v->{Port} END } target_putfilecontents_root_stash($cho,10,$ccfg,"/etc/nbd-client"); +} + +sub configclient_stretch () { + my $ccfg = <{Name} export$v->{Ix} +END + } + + target_putfilecontents_root_stash($cho,10,$ccfg,"/etc/nbdtab"); +} + +sub configclient () { + target_cmd_root($cho, "dpkg --purge nbd-client ||:"); + + if ($cho->{Suite} !~ m/stretch/) { + configclient_pre_stretch(); + } else { + configclient_stretch(); + } + target_install_packages($cho, qw(nbd-client)); + + if ($cho->{Suite} !~ m/squeeze|wheezy|jessie/) { + foreach my $v (@vols) { + my $nbddev = "nbd$v->{Ix}"; + target_cmd_root($cho, <{Gho}{Vg} +if ! test -L $v->{Path}; then ln -s /dev/$nbddev $v->{Path}; fi +END + } + target_cmd_root($cho, "/etc/init.d/nbd-client start"); + } } sub shuffleconfigs () {