From patchwork Fri Oct 20 10:38:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 10019825 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 2AB9B60211 for ; Fri, 20 Oct 2017 11:00:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DD2328EBB for ; Fri, 20 Oct 2017 11:00:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12BC228ECD; Fri, 20 Oct 2017 11:00:26 +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 A482528EBB for ; Fri, 20 Oct 2017 11:00:25 +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-0005IR-8z; 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 1e5V0P-0005Hk-Gz for xen-devel@lists.xenproject.org; Fri, 20 Oct 2017 10:58:21 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 87/85-02146-CC6D9E95; Fri, 20 Oct 2017 10:58:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve6Zay8 jDX6/EbX4vmUykwOjx+EPV1gCGKNYM/OS8isSWDMeTZvPXLCMo2LOZ8EGxvdsXYycHBIC/hJn T61hBrHZBJQlfnb2gsVFBPQkmg48ZwSxmQXsJJoffWABsYUFgiW+b1kGVsMioCrRsG4/mM0rY Cmx504zI8RMeYldbRdZQWxOoPi63XfBeoUELCRWn13JBmErSHRMP8YE0SsocXLmExaIXRISB1 +8YJ7AyDsLSWoWktQCRqZVjBrFqUVlqUW6hkZ6SUWZ6RkluYmZObqGBqZ6uanFxYnpqTmJScV 6yfm5mxiBocMABDsY+2Y5H2KU5GBSEuUNrHwZKcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC99FV oJxgUWp6akVaZg4wiGHSEhw8SiK8G0HSvMUFibnFmekQqVOMuhwdN+/+YRJiycvPS5US530MU iQAUpRRmgc3AhZRlxhlpYR5GYGOEuIpSC3KzSxBlX/FKM7BqCTM6wwyhSczrwRu0yugI5iAjm C3fwFyREkiQkqqgbH27PvtfzecWDLRwsOeoc3445z0hIg2Lb9tT/Sv2DhN97zxyTzlW+NDv7r 19ywET6kbdGTMP/xv24cZZzvvdEYelc406rxRqNe1O3/OmSMRmifd723QsNd7/DVMR/Pg96W7 rJaofz3bqCuduehtib7LxOV7vDprbb4zlLip3n2tqZkrVHnBfpMSS3FGoqEWc1FxIgAeI3Kyo wIAAA== X-Env-Sender: prvs=459d591f5=wei.liu2@citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1508497098!79442039!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 59428 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="455193365" From: Wei Liu To: Xen-devel Date: Fri, 20 Oct 2017 11:38:37 +0100 Message-ID: <20171020103840.32762-14-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 13/16] 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 54d5d1c..7f8251d 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -114,6 +114,18 @@ 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 = "\nd-i debian-installer/add-kernel-opts string net.ifnames=0\n" + if $ho->{Suite} =~ m/stretch/; + + $preseed_file .= "$netifnames"; + $preseed_file .= preseed_hook_cmds(); return $preseed_file;