From patchwork Tue Oct 31 13:51:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10034595 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 65124602B9 for ; Tue, 31 Oct 2017 14:00:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3746D28AB6 for ; Tue, 31 Oct 2017 14:00:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C3B728AD6; Tue, 31 Oct 2017 14:00:45 +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 BCD1328ACB for ; Tue, 31 Oct 2017 14:00:44 +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 1e9X3h-0003RA-VL; Tue, 31 Oct 2017 13:58:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e9X3g-0003Pk-6c for xen-devel@lists.xenproject.org; Tue, 31 Oct 2017 13:58:24 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id FC/F8-31302-F7188F95; Tue, 31 Oct 2017 13:58:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprOIsWRWlGSWpSXmKPExsXitHRDpG59449 Ig60/hC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxLD9uYCpZwVBxqWcncwPiZrYuRk0NCwF/i 8fX7rCA2m4CyxM/OXrC4iICeRNOB54wgNrOAnUTzow8sILawQJjE28YtYDUsAqoS99tWM4HYv AKWEg+XrWeHmCkvsavtIthMTqD4+qdNYHEhAQuJe8u+M0LYChId049B9QpKnJz5hAVil4TEwR cvmCcw8s5CkpqFJLWAkWkVo0ZxalFZapGusYFeUlFmekZJbmJmjq6hgalebmpxcWJ6ak5iUrF ecn7uJkZg8NQzMDDuYJywyu8QoyQHk5Io707H75FCfEn5KZUZicUZ8UWlOanFhxhlODiUJHgd Gn5ECgkWpaanVqRl5gDDGCYtwcGjJMLLDZLmLS5IzC3OTIdInWI05ui4efcPE8ezma8bmIVY8 vLzUqXEedNASgVASjNK8+AGweLrEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVhXg6QKTyZeS Vw+14BncIEdIqXBNgpJYkIKakGRjsGDX6/kJWT6pfX12za7KazNabktq9LzQnVvj85+ySmZcx sObrtjmFll/KSu8tmdp6b0lrx86/65SJpXdvYDTNrpn3d7DBjusWToxOqF5QoFxRdmPH9QNwL hznh756ZCNY8ys8/Y3QiSD2CJ3/1aUVHB4cPTdedH1y1+HQoc0qN5NUD2yVZRJRYijMSDbWYi 4oTAaQx0fuqAgAA X-Env-Sender: prvs=470789eaf=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1509458299!109585852!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12311 invoked from network); 31 Oct 2017 13:58:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 31 Oct 2017 13:58:22 -0000 X-IronPort-AV: E=Sophos;i="5.44,324,1505779200"; d="scan'208";a="449213307" From: Wei Liu To: Xen-devel Date: Tue, 31 Oct 2017 13:51:55 +0000 Message-ID: <20171031135203.11537-12-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 11/19] ts-debian-hvm-install: disable new nic naming scheme 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 This is required to fix nested hvm test. The L1 host is installed by this script. We want the L1 host to not use the new nic naming scheme. Signed-off-by: Wei Liu --- ts-debian-hvm-install | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 54d5d1c..afe8dc9 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -114,6 +114,19 @@ set -ex in-target sed -i 's/^deb *cdrom/#&/g' /etc/apt/sources.list END + # Do not use "Predictable Network Interface Names" -- this can break + # nested HVM tests. + # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ + # + # See also + # https://www.debian.org/releases/stretch/example-preseed.txt + my $netifnames = ""; + $netifnames = <{Suite} =~ m/stretch/; +d-i debian-installer/add-kernel-opts string net.ifnames=0 +END + + $preseed_file .= "$netifnames"; + $preseed_file .= preseed_hook_cmds(); return $preseed_file;