From patchwork Tue Oct 31 13:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10034597 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 EBEDE602B9 for ; Tue, 31 Oct 2017 14:00:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 227B32842E for ; Tue, 31 Oct 2017 14:00:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16EF128ACB; Tue, 31 Oct 2017 14:00:46 +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 BD46D28AB6 for ; Tue, 31 Oct 2017 14:00:45 +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 1e9X3i-0003RV-6e; Tue, 31 Oct 2017 13:58:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9X3g-0003QE-SP for xen-devel@lists.xenproject.org; Tue, 31 Oct 2017 13:58:24 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 06/10-14867-08188F95; Tue, 31 Oct 2017 13:58:24 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprCIsWRWlGSWpSXmKPExsXitHSDvW59449 Igzk/TC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oy9d68xF7xlr5i0M72BcR5bFyMnh4SAv8S7 Ga+ZQGw2AWWJn529YHERAT2JpgPPGUFsZgE7ieZHH1i6GDk4hAV8JKZPKAIJswioSlzp7mcBs XkFLCV+nDjLBDFSXmJX20VWEJsTKL7+aRM7iC0kYCFxb9l3RghbQaJj+jEmiF5BiZMzn7BArJ KQOPjiBfMERt5ZSFKzkKQWMDKtYlQvTi0qSy3SNdRLKspMzyjJTczM0TU0MNPLTS0uTkxPzUl MKtZLzs/dxAgMGwYg2MG487nTIUZJDiYlUd6djt8jhfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw OjT8iBQSLEpNT61Iy8wBBjBMWoKDR0mE9zBImre4IDG3ODMdInWK0Zij4+bdP0wcz2a+bmAWY snLz0uVEud9BFIqAFKaUZoHNwgWWZcYZaWEeRmBThPiKUgtys0sQZV/xSjOwagkzOsKMoUnM6 8Ebt8roFOYgE7xkgA7pSQRISXVwOg5QeOpzVmPjUwX/220TU3q7c+WU8x9fNDjsjPP3jM+NRr 1zernVj/Oe8IZ36szyUp2gcbMKlZ16Wb+o+cUFYt2ne3Pj8pbUCZlNs2z/a7Tzo9/elJ3bMnS u3K9me/GCZM9O21OrPKtfKWxRt/IyNfvXsL/Cc0b92rt6/vs41iS03jrsF9GuxJLcUaioRZzU XEiAC9eOB+nAgAA X-Env-Sender: prvs=470789eaf=wei.liu2@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1509458298!73901128!3 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 21179 invoked from network); 31 Oct 2017 13:58:23 -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:23 -0000 X-IronPort-AV: E=Sophos;i="5.44,324,1505779200"; d="scan'208";a="457036580" From: Wei Liu To: Xen-devel Date: Tue, 31 Oct 2017 13:51:54 +0000 Message-ID: <20171031135203.11537-11-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 10/19] 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 288766d..9a63c61 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -175,6 +175,18 @@ sub otherfixupcfg () { $extra .= " iommu=soft"; } + # 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 stretch when it tries to scan for the + # inexistent device(s) for a long time. See also Debian bug #784810. + # + # 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\s*=\s*['"](.*)['"]/extra = '$1 $extra'/mg; };