From patchwork Fri Oct 20 10:38:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10019821 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 CD16B60211 for ; Fri, 20 Oct 2017 11:00:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C036328EBB for ; Fri, 20 Oct 2017 11:00:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B517A28ECD; Fri, 20 Oct 2017 11:00:23 +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 537EB28EBB for ; Fri, 20 Oct 2017 11:00:23 +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 1e5V0R-0005JO-Mm; Fri, 20 Oct 2017 10:58:23 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e5V0Q-0005Hx-98 for xen-devel@lists.xenproject.org; Fri, 20 Oct 2017 10:58:22 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id B8/29-17628-DC6D9E95; Fri, 20 Oct 2017 10:58:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprGIsWRWlGSWpSXmKPExsXitHSDve7Zay8 jDT7u5bb4vmUykwOjx+EPV1gCGKNYM/OS8isSWDMOf3jOXrCPveL2pd1sDYy/WLsYOTkkBPwl Nux8zQhiswkoS/zs7GUDsUUE9CSaDjwHizML2Ek0P/rA0sXIwSEs4CnR8ckPJMwioCqx/Mxds HJeAUuJ5Zs2M0OMlJfY1XYRbDwnUHzd7rssILaQgIXE6rMr2SBsBYmO6ceYIHoFJU7OfMICsU pC4uCLF8wTGHlnIUnNQpJawMi0ilGjOLWoLLVI19BIL6koMz2jJDcxM0fX0MBULze1uDgxPTU nMalYLzk/dxMjMHQYgGAHY98s50OMkhxMSqK8gZUvI4X4kvJTKjMSizPii0pzUosPMcpwcChJ 8D66CpQTLEpNT61Iy8wBBjFMWoKDR0mEdyNImre4IDG3ODMdInWK0ZjjxsPrf5g4Om7e/cMkx JKXn5cqJc77GKRUAKQ0ozQPbhAsui4xykoJ8zICnSbEU5BalJtZgir/ilGcg1FJmNcZZApPZl 4J3L5XQKcwAZ3Cbv8C5JSSRISUVANj0cQWmxnPn+5eKh97jG99nI2R+/J/910mdE7kuc0YkHM oS/aL5bVP7OUCjKcXv58U3vRIRXTabPFgnohC6cPTkuT6UxxsZOfteywYVeJX41nTJNLIefaY 64MfBRs0bP7ENaWfeLsw935pw8uSFJ4dYmWLtlv+47uzvX/HtD1bu4L3Bk2xsm5RYinOSDTUY i4qTgQAFbv45qkCAAA= X-Env-Sender: prvs=459d591f5=wei.liu2@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1508497098!79442039!2 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 59485 invoked from network); 20 Oct 2017 10:58:20 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 20 Oct 2017 10:58:20 -0000 X-IronPort-AV: E=Sophos;i="5.43,405,1503360000"; d="scan'208";a="455193380" From: Wei Liu To: Xen-devel Date: Fri, 20 Oct 2017 11:38:35 +0100 Message-ID: <20171020103840.32762-12-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171020103840.32762-1-wei.liu2@citrix.com> References: <20171020103840.32762-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: ian.jackson@eu.citrix.com, Wei Liu Subject: [Xen-devel] [OSSTEST PATCH 11/16] ts-debian-fixup: use correct resume device 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 See code comment for explanation. Signed-off-by: Wei Liu --- ts-debian-fixup | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ts-debian-fixup b/ts-debian-fixup index d476467..fe37c30 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -176,6 +176,18 @@ sub otherfixupcfg () { } + # There might be stale entries in /etc/initramfs-tools/conf.d/resume + # which get stored in the initramfs. That introduces delay in guest booting + # which might cause tests to fail. + # + # This is particularly prominent in systemd enabled releases when it tries + # to scan for the inexistent device(s) for a long time. + # + # Override that in kernel command line with the correct swap partition. + $cfg =~ m/'phy:.+-swap,(xvda\d+),.*'/; + $extra .= " resume=/dev/$1"; + logm("change resume device to $1"); + $cfg =~ s/^extra.*//mg; $cfg .= "\nextra='$extra'\n"; };