From patchwork Mon Mar 18 16:55:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595596 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE94BC54E72 for ; Mon, 18 Mar 2024 16:56:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694942.1084254 (Exim 4.92) (envelope-from ) id 1rmGHD-0002tk-Ui; Mon, 18 Mar 2024 16:55:55 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694942.1084254; Mon, 18 Mar 2024 16:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHD-0002td-Rc; Mon, 18 Mar 2024 16:55:55 +0000 Received: by outflank-mailman (input) for mailman id 694942; Mon, 18 Mar 2024 16:55:54 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHC-0002f9-Lg for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:54 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 614004a5-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:52 +0100 (CET) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-412e784060cso33041695e9.1 for ; Mon, 18 Mar 2024 09:55:52 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:51 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 614004a5-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780952; x=1711385752; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pFcZD/vzCDZy7qgNaMCGQWkAf2ZxLdhNx3qOWLX+MmQ=; b=LoYGUUIwwtNY88Ya7k++i7V57mDREXCNQP8BR/24s1etfq96izIqjssA7mkBVFC79E XYOfz6K9mXr95T/jm2R/LxAPZjSOYjXyqZT1L5z4+0R+Iunv+AfqG85XkTrrfvkTfyep 95xMOkEGdIcAIcuupE19UfVRsY5ipKbLunrB4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780952; x=1711385752; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pFcZD/vzCDZy7qgNaMCGQWkAf2ZxLdhNx3qOWLX+MmQ=; b=Dwapubd876t2p+AoFfdeJP5CaCxh5PwZ+X8trHXIOIXQh5WhOE8Mvy50lffzW2VP8P i/3xGVeX4p7xFSMCYRNCRHio+QVEKWxq6seulyZtZ+jBUtgswhAA7Gl6LjzEXiweKrFP tRIj+UD9lCtoXBYs3vqyd5Qi/8X9zoe2rCjAVwNHei3LjXRAglx6eHg1cHODx2rgnVHm 6pSQRhklqMFn9aMFsZUMXgTfpcPrt8fM4B4CgpnQiweE4tJORm/YJIWsSUiEB2lJDLZ0 q+8k7bR06x6ibQhRAp6yJD+CKOYAzE00d48s4oMv6+1Nctk6m5tfCmEDkPsdqp88UeiP 66xg== X-Gm-Message-State: AOJu0Yy4xsMAhlh/jiSsu9pYN4ncEi0xvOzhd+rWmYTjyJCnAiNFIEOW E8U7TFqL1knpI6AXJkmwkRn5+ERa81XeAqbNnBVyl7sWJ6AGLsd1jTM+lJmxbd+L/TpdRPaAWcp m X-Google-Smtp-Source: AGHT+IG8YAV1ftnzazAZIDxBa3utzD1TDHSKSdBtOtR7vb9I1M5xfaPy+clF7DLuB05ctRuoArjHUg== X-Received: by 2002:a05:600c:4f04:b0:412:e0f7:ef52 with SMTP id l4-20020a05600c4f0400b00412e0f7ef52mr148317wmq.19.1710780952144; Mon, 18 Mar 2024 09:55:52 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 01/36] production-config: Add bookworm debian install media filename Date: Mon, 18 Mar 2024 16:55:10 +0000 Message-Id: <20240318165545.3898-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- production-config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/production-config b/production-config index 2c44805c..6345c40c 100644 --- a/production-config +++ b/production-config @@ -101,6 +101,8 @@ DebianImageVersion_jessie 8.2.0 DebianImageVersion_stretch 9.4.0 DebianImageFile_buster_amd64 debian-10.12.0-amd64-xfce-CD-1.iso DebianImageFile_buster_i386 debian-10.12.0-i386-xfce-CD-1.iso +DebianImageFile_bookworm_amd64 debian-12.5.0-amd64-netinst.iso +DebianImageFile_bookworm_i386 debian-12.5.0-i386-netinst.iso # Update with ./mg-netgrub-loader-update From patchwork Mon Mar 18 16:55:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595595 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E71ECC54E6A for ; Mon, 18 Mar 2024 16:56:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694944.1084274 (Exim 4.92) (envelope-from ) id 1rmGHF-0003NB-C7; Mon, 18 Mar 2024 16:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694944.1084274; Mon, 18 Mar 2024 16:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHF-0003Md-98; Mon, 18 Mar 2024 16:55:57 +0000 Received: by outflank-mailman (input) for mailman id 694944; Mon, 18 Mar 2024 16:55:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHD-0002f9-Li for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:55 +0000 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [2a00:1450:4864:20::334]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61ba3bef-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:53 +0100 (CET) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-414006a0115so34420025e9.3 for ; Mon, 18 Mar 2024 09:55:53 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:52 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 61ba3bef-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780953; x=1711385753; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HcKGBjF7duyhQKCXtEFBeJNsUbmPicCjB0pyp6hYt+o=; b=WsrC13EOsz8uLsoCjJAXgTlodUkrdK5HChxaGKeJHl69+9lwZ0bvIU/lQDF+SmzCyy juFtSc9OwIbx8lscllSTUT6ejNn8qBXQW4RfS/CzsAuMIHw3tHwpN/zfYgWNSteMArSL yPqKAVyT7JkzzfJwPP6w0A+hqd6Q1AwrgioaU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780953; x=1711385753; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HcKGBjF7duyhQKCXtEFBeJNsUbmPicCjB0pyp6hYt+o=; b=slJZBswnbkjJZ6ePOXwmWOxEYh9pOgdI1dgZB/+Fn2znzsTsFcHVDZXIOwqsxuMaWL SKS/1OWy/8fPJ79zbLePbgycHOf2YPDuEPcY8s1s1dFV7qT00gSXKrdnIrYqQUix0/2v aueKRo+xfKhSSn+zZvyoHj+SxY5NiTyDuGY3xBm6hpkeN19SHPP3qiI4NM7nQR4mqLE0 aEXJ8Pr99hfZGQs4Q0Wq2GFvGSQPw4fEgKe32r1Bc6sQ8I+rpoezXurPqDgw5LXp9puX xkj6fI4W/yj6az0NAltswkHsXccoUVUYSccLt7WIHnW8Gt9XzyiZMgK59auYGTyZwxJ8 OnNw== X-Gm-Message-State: AOJu0YwVJDvgS8tAPGZBK0dEBOZ8FcSadIGW6Xd6K/nryDHrcB2bLQOi qNlANVlFN7NvEGQEeWx5ESE+gyeAvdB1N/s7+P1bmaYqq03tVJ8tt56Cv/sYEAwBIzS/oQ8/S58 L X-Google-Smtp-Source: AGHT+IEXEM7HDGP+KeNvTIogdB7vL94LrpI5Hk/v603q5Y0GFu3bqylgTJf7/90kics/0EwcAuWZmg== X-Received: by 2002:a05:600c:4e8e:b0:414:286:fd21 with SMTP id f14-20020a05600c4e8e00b004140286fd21mr6171036wmq.28.1710780952980; Mon, 18 Mar 2024 09:55:52 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 02/36] ts-xen-build-prep: Only force git protocol v2 on buster Date: Mon, 18 Mar 2024 16:55:11 +0000 Message-Id: <20240318165545.3898-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Newer version of Debian and thus git would use this automatically, no need to force it. Signed-off-by: Anthony PERARD --- Osstest/TestSupport.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index f0e087aa..0dded9b2 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -3257,7 +3257,7 @@ END # Adding mandadory use of Git protocol v2 # necessary on buster when building QEMU v8.1 - $gitcfg .= <{Suite} =~ m/buster/; [protocol] version = 2 END From patchwork Mon Mar 18 16:55:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595600 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59E0DC54E6A for ; Mon, 18 Mar 2024 16:56:08 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694943.1084260 (Exim 4.92) (envelope-from ) id 1rmGHE-0002wj-8P; Mon, 18 Mar 2024 16:55:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694943.1084260; Mon, 18 Mar 2024 16:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHE-0002vx-1u; Mon, 18 Mar 2024 16:55:56 +0000 Received: by outflank-mailman (input) for mailman id 694943; Mon, 18 Mar 2024 16:55:55 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHD-0002gq-5S for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:55 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 621d9fcd-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:55:54 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-41400a9844aso17118995e9.0 for ; Mon, 18 Mar 2024 09:55:54 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:53 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 621d9fcd-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780953; x=1711385753; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D8kMmfgRq+uIvUAnPJWzu57cwgfUkor1PWJ6MGv3dPY=; b=jLdOEag0dDzCt2HMeAKogbxsrj/VL4ryTnec5X0ImhJMVvooJdBc+t/0z3VnrfAxC1 OIIyUR92gi6mCVxvuKt5a3YxQXcPt0fHlWPa2cZ0A6EZKGYMktADOsnHfWuXHh/gP/sP M46IDWHvhZNnpWZ5/Y7IqI53caAUvNRGUDDrs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780953; x=1711385753; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D8kMmfgRq+uIvUAnPJWzu57cwgfUkor1PWJ6MGv3dPY=; b=TUigHAH4AlQCGOfbt8D7Re5NW5Do9nelw8Z9KsNahAws+BxMMFhua4RlSQyp7J+9as REoo3Nr7Ux/uuid11HlG+uz1ur8ECkLY8AcfiChO1G48+jHbZgd9oE6qhIxi9QaTG0K1 JJorcm+Hx0KkeUMfYcHtD2+k6ulFnwJB64i7KCPj5Anz0Gi/MDbIlG/ppWHUOLGpQWxV JNwVnweRUVn3MGr9OaaGCd9ZFCM8Ob9JWejQ0AS84czA0qOpSNb7junSwk/CH+L9h1xM 1lVws9719MZ15NhDOLFUJYS6+uEiKWZYgMAbWJzn25QDaoMVxYb3xdPnRFBOsgaoFZav Xy0w== X-Gm-Message-State: AOJu0YzsiMkvecqElLq7/VMHjzcMsiVoJG1PR7Vq5FailhDS+VW4TNXE OgKmSAwBnhQ3GOQvZRN2z1XWA2ZzuW62sb3YVbph7NdAqqqIqOcwygdkTEdKROWgpKNj21sbPyA x X-Google-Smtp-Source: AGHT+IH6j9RfgTsn7+po8KRRANVQ3xRpnv0hTecjgJ3XM5FB9vDJ9H1qgvfABbSR1BvxNI42chVO1Q== X-Received: by 2002:a05:6000:cc5:b0:33e:c0fc:5e4b with SMTP id dq5-20020a0560000cc500b0033ec0fc5e4bmr185338wrb.2.1710780953624; Mon, 18 Mar 2024 09:55:53 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 03/36] mgi-common: Fix fetch_debian_package error message Date: Mon, 18 Mar 2024 16:55:12 +0000 Message-Id: <20240318165545.3898-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 $@ expand to two or more words, but fail() only take one argument. So if there's more than one argument left, fail() only shows the first one, and don't event display "not found". Signed-off-by: Anthony PERARD --- mgi-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mgi-common b/mgi-common index 6ce34162..98f795b1 100644 --- a/mgi-common +++ b/mgi-common @@ -49,7 +49,7 @@ fetch_debian_package () { set -e if [ $rc -ne 0 ] || [ x$pkgfile = x ]; then - fail "package matching $@ not found"; + fail "package matching $* not found"; fi fetch "$site/$pkgfile" From patchwork Mon Mar 18 16:55:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595597 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BE2BCC54E58 for ; Mon, 18 Mar 2024 16:56:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694946.1084287 (Exim 4.92) (envelope-from ) id 1rmGHG-0003dC-HE; Mon, 18 Mar 2024 16:55:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694946.1084287; Mon, 18 Mar 2024 16:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHG-0003aJ-7W; Mon, 18 Mar 2024 16:55:58 +0000 Received: by outflank-mailman (input) for mailman id 694946; Mon, 18 Mar 2024 16:55:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHE-0002f9-Lk for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:56 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 62985079-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:55 +0100 (CET) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-414612cfd82so2582615e9.2 for ; Mon, 18 Mar 2024 09:55:55 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:53 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62985079-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780954; x=1711385754; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JMMRuVEHCIqxXdaks8BW5gt1whiZVVCqeN/v42vNtjo=; b=BKgyvtJ5cmmsbfli/EO4wkwbKcuUWtqDpP0vE4vdRjqureIsn23EwWKC0xqBleNOe0 D6DN6KoZMEL1RJs1ib45W9JNzd27JQqfdwrPSAYNMUmeayZoxn+GWGmQ6vGTN0lBjbQa arhaTAIpkam+0SMfBQmBInV7TjJqLXkh2jv1w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780954; x=1711385754; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JMMRuVEHCIqxXdaks8BW5gt1whiZVVCqeN/v42vNtjo=; b=PeMXS3jm0o0ozAxyyXFQVMqf+MWN6tffym5r5FZNveN0Gdx8SYnkfuQem1ZHhSKO07 XkNfaYElK5/H6WNj/SVQn6+fFfXjzT0VF6owZQBojWg/aYIuWp8EJPkp9jj1sTDaxkuG xTqGerUMKjjCRoLz21jHa1+tYKxrtp3ka15MndKHhqkxDkd//VywMgeZJWj5J7oXynzI xD+UGK9teo5fhh+2PzwMO1pwH3wIqqar95P6s5r6/KUzdLNG5SvrUQQLIm1c0QD/TD9e yL7mFVh3Z+dLQo75XEUpA9+O7xkMbSBSv2yHr4TwoSIdN0ZL/8/8h/98TDcA0L+QxDpr ee9Q== X-Gm-Message-State: AOJu0YwzUANptF8K/tk1RDZHUuEa5K3wN5MnPCv4W6eFbkNViafVA2G7 GZKwT2bHMfzsS9I7EnYwqbWkc779+de5nDJL8J69N/U0yGVHyZZc7ubUIv1eAn5SseRSB41OI89 f X-Google-Smtp-Source: AGHT+IF0dBp3wk86BI4hu/16kKuYdAhsJDeyKJ8dVApEQECl5QUZVR6qkeNDEn31Hh7GtksB2LyKvQ== X-Received: by 2002:a05:600c:5118:b0:414:203:3b70 with SMTP id o24-20020a05600c511800b0041402033b70mr40994wms.28.1710780954475; Mon, 18 Mar 2024 09:55:54 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 04/36] mg-debian-installer-update: Download non-free firmware from new repo. Date: Mon, 18 Mar 2024 16:55:13 +0000 Message-Id: <20240318165545.3898-5-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- mg-debian-installer-update | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index 4fb4bc21..31b8a192 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -105,7 +105,14 @@ if [ "x$dtbs" != "x" ] ; then gzip -9nf dtbs.tar fi -pfile=$sbase/non-free/binary-$arch/Packages.gz +case $suite in + wheezy|jessie|stretch|buster|bullseye) + pfile=$sbase/non-free/binary-$arch/Packages.gz + ;; + *) + # Starting with bookworm, firmware are in a new repo + pfile=$sbase/non-free-firmware/binary-$arch/Packages.gz +esac fetch $pfile >Packages.gz From patchwork Mon Mar 18 16:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7BA25C54E5D for ; Mon, 18 Mar 2024 16:56:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694945.1084278 (Exim 4.92) (envelope-from ) id 1rmGHF-0003QZ-N4; Mon, 18 Mar 2024 16:55:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694945.1084278; Mon, 18 Mar 2024 16:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHF-0003PE-Gu; Mon, 18 Mar 2024 16:55:57 +0000 Received: by outflank-mailman (input) for mailman id 694945; Mon, 18 Mar 2024 16:55:56 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHE-0002gq-9i for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:56 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 63090c5b-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:55:55 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-414624a65beso19915e9.3 for ; Mon, 18 Mar 2024 09:55:55 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:54 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 63090c5b-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780955; x=1711385755; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pJd5erfZkWtwSzXglEFDYQHe8C/Kx7YDmuH1rlEbXsI=; b=W+3SSKsj25z4mEM2262ebLcKPVVrUDuKL8880DMLcgNqRaBkJUkE20KT2d4jbpQ2ZE zGeA7IeFFelyEZ1PBnCQ5YFXzD4q7PGvmqaHXzNe6g57USnYojqsicBleJBjzJq9ZSP1 CWNhpcrY1NOgT876Jw7j8JArRO0StL2KWFm54= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780955; x=1711385755; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pJd5erfZkWtwSzXglEFDYQHe8C/Kx7YDmuH1rlEbXsI=; b=NHnv4F+Lwd7xeD3sWv/cKIPA/xiJAb/kWpDBnI/xhPN9PHkrikd1tjkecAfx5XdYUw B0uUBQUERjFjjjzUAAAxK3Ev+Pt+rm0ejqN4fJgnZAHgPKlGkETJgQJmSNsjDJwsxtPS DeSrd0pGvs5gqMOVPoqUiYWNAWr0zXlaMpAN3m1FTlCqaQGJhlDomAbFVNhi1LDmuEW+ UA5ohZ0YmJRtEvIU6rGTNmp2XLfDdOPjPVR6rcxeaGZz/csSY2KfQ8KGedWLTqlgLWtK zIIbPMN1hG6r7Tvgr1R1Ojpb5mQEALO8IKIJMuAI0Xtvo8nGYnOYMSq9fJVUXRv36znY B8cQ== X-Gm-Message-State: AOJu0YzwN9D3yvpySyxKy+2e48kWNWrxflfiquSUPyHz/f5sTvFbZEBL lVf7g7XP13LldfG+ZVHKM/yjH50R/ekZwXIlf7cTAyn9VJigyhtCJSBR60wnXjbtmuBMwbhDwtA P X-Google-Smtp-Source: AGHT+IEJ2/iL6KmWbo51mROrBbNxnkrtty+8fZDPRUDG1OnLfQQ6qKRZF4wesc3cLJt4vWLpR13A7A== X-Received: by 2002:a05:600c:458b:b0:413:e523:eed2 with SMTP id r11-20020a05600c458b00b00413e523eed2mr10017053wmo.33.1710780955190; Mon, 18 Mar 2024 09:55:55 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 05/36] ts-host-install: fix ntp.conf path on bookworm Date: Mon, 18 Mar 2024 16:55:14 +0000 Message-Id: <20240318165545.3898-6-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- ts-host-install | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ts-host-install b/ts-host-install index f79a1beb..61433e64 100755 --- a/ts-host-install +++ b/ts-host-install @@ -151,7 +151,13 @@ END my $ntpserver = get_target_property($ho, 'NtpServer'); if ($ntpserver) { - target_editfile_root($ho, '/etc/ntp.conf', sub { + my $ntpconf_path; + if ($ho->{Suite} =~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) { + $ntpconf_path = '/etc/ntp.conf'; + } else { + $ntpconf_path = '/etc/ntpsec/ntp.conf'; + } + target_editfile_root($ho, $ntpconf_path, sub { my $done= 0; while () { if (m/^server\b|^pool\b\s/) { From patchwork Mon Mar 18 16:55:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595598 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A97F8C54E73 for ; Mon, 18 Mar 2024 16:56:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694947.1084302 (Exim 4.92) (envelope-from ) id 1rmGHH-00044M-QA; Mon, 18 Mar 2024 16:55:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694947.1084302; Mon, 18 Mar 2024 16:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHH-00042F-KO; Mon, 18 Mar 2024 16:55:59 +0000 Received: by outflank-mailman (input) for mailman id 694947; Mon, 18 Mar 2024 16:55:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHG-0002f9-42 for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:58 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 63843ede-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:56 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-41411421113so7763755e9.1 for ; Mon, 18 Mar 2024 09:55:56 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:55 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 63843ede-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780956; x=1711385756; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OxOm50nBYccC83Ra9oGTkRkIB7zi8ZuMsoGfL9HmHqU=; b=trkv0WHAGgaLUO2UcAApmNANrQo/R5PhuJw6L1ErGdytuhfL/q6va9iyrYZSs9adyz /meN5zP0qnJJkfnHhLN6anROemEI89PQVkYIFBb7Vq2AY7TYYf1ydKaJY62HVKKI1qjF hDlVnCF+WC7nZVZAXewDi4sB1RaiK40FFQkQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780956; x=1711385756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OxOm50nBYccC83Ra9oGTkRkIB7zi8ZuMsoGfL9HmHqU=; b=bcHuV4yjBw9eNm4kzk9yo+fVBjJO1/hYRqSPYxnpKMYPjiovPD061jUYEWvglFGByQ E7lB7iS52eMCytTi4e1rFTNasxU/e9SCpaxf+rXUZW7LHzCIJOLKJxgG/5vPpbuF2tlz dzABMl0r8xd0PvwhjB2v2Rznmoi28NHvw1lJwI+3vUg09JqC6g4dcBbHFkicRnD0OGXm g4FqLZz2BT5bCsjTLlBcqIffLHqrskeB8rQ4z2msCwe5O7ZXb40F8Qwpztds2JG3LJXT K23rzFynxzNs6HvOoAHz7Yc1uN5LWIP9T8Cch762hWqFOLViKv4Sf86Pf0K1Hfso/xKn 1mzQ== X-Gm-Message-State: AOJu0Yzsu21iOC9y2WFkimdzVel7keHB+lwsaBIbfGd8IoUrRl8o3NU2 ipNIELljpSp8xgX47JokFWE6tX9ar6Xyi91iuEFay1egefBP4tQcTqu1fcATiU2TI4OalCT/UUq 2 X-Google-Smtp-Source: AGHT+IEs0T2xUdzMiCM9wX1GUfZ4c07htL6c5G668fyp8ybNjhYPol7w21y72KJ30v6arccsWDXdqw== X-Received: by 2002:a05:600c:1554:b0:414:39c:d9f0 with SMTP id f20-20020a05600c155400b00414039cd9f0mr26678wmg.2.1710780955895; Mon, 18 Mar 2024 09:55:55 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 06/36] ts-host-install: fix ntp server setting Date: Mon, 18 Mar 2024 16:55:15 +0000 Message-Id: <20240318165545.3898-7-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 The Debian #778564 bug report is still open, the ntp.conf file doesn't contain the setting from NtpServer after installation, so we still need to edit ntp.conf on Bookworm. Signed-off-by: Anthony PERARD --- ts-host-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-host-install b/ts-host-install index 61433e64..00277485 100755 --- a/ts-host-install +++ b/ts-host-install @@ -161,7 +161,7 @@ END my $done= 0; while () { if (m/^server\b|^pool\b\s/) { - if ($ho->{Suite} =~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) { + if ($ho->{Suite} =~ m/lenny|squeeze|wheezy|jessie|stretch|buster|bookworm/) { $_= $done ? "" : "server $ntpserver\n"; } else { m/^server \Q$ntpserver\E\s/ or From patchwork Mon Mar 18 16:55:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A7FB0C54E5D for ; Mon, 18 Mar 2024 16:56:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694948.1084313 (Exim 4.92) (envelope-from ) id 1rmGHJ-0004OH-2A; Mon, 18 Mar 2024 16:56:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694948.1084313; Mon, 18 Mar 2024 16:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHI-0004N9-Ty; Mon, 18 Mar 2024 16:56:00 +0000 Received: by outflank-mailman (input) for mailman id 694948; Mon, 18 Mar 2024 16:55:58 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHG-0002f9-QX for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:58 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 63e3279b-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:57 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-41409fd8b6bso14346895e9.1 for ; Mon, 18 Mar 2024 09:55:57 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:56 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 63e3279b-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780956; x=1711385756; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7d1DO2DCVrdoG6T/ipv00ftRwAovDdK3fxHjf8zrTD8=; b=ejJI6tXevR/XiucRqH1xDSToXE9OHjoM9wnj9AoM4/iiuDtp3HGGYjfv+aUITzcfOX maiEH4okgG4spaI0fOJBWMj2FayBrX6JYnCxqCNgZ7kv0jSxguCn+Jvs5oKw/nRO+iNk wN1GD6t8mDRKq/70lh1Xiu1cDT/K3IuwsQNX0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780956; x=1711385756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7d1DO2DCVrdoG6T/ipv00ftRwAovDdK3fxHjf8zrTD8=; b=Ugd8orX4ktR5QMIEv7+xlvzEY+UF3yfvaXppyqmuBgSsUthAzFFIG9qPwD4TYRTyBO FGW4gU922ha9trFuB4Q5uh/xU6QbPhDuqnfZOvIBYn3t2wOCnb7aD+IoGm//XlelifU/ /AmxTupLISFLfWgXbpbY7BBinpuMVM5joJPwBMSk1svSca4owZUEp28fnqz7DAe4RmHz 3cKxpKfd53ar6uvm7X1VfNbc4m2724AOwiy4YYWpYBDxlEBvp4Cg86zeHoBhhQMK51Na 6VmdkiatT37qpAJkxkHhFH+AMTtVBWPpEvxdU0G2Jp5GlrSKoYWqEXDFb4stW5wCf5ms gYYQ== X-Gm-Message-State: AOJu0YwBY0im651PZrUfFk80h10X+ZEcIPzDKEXt7RlAd1YBvstG1CER xVU0/INCL3eN+QqsfN6Yqhu+tUkaolQL+u00I1D9C4PErXqguGxKOnv2FPkNBpF8a4ON4/c0NAo G X-Google-Smtp-Source: AGHT+IF9t9oDq5fjX710cgeERIrlw3KN0gLpL5ONKh1iYfqw9lmCcZ7Kxt8nVO4plWvZdHTwWJBAHg== X-Received: by 2002:a05:600c:3514:b0:414:102f:27b8 with SMTP id h20-20020a05600c351400b00414102f27b8mr2074437wmq.32.1710780956701; Mon, 18 Mar 2024 09:55:56 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 07/36] ts-host-install: Restart ntp service Date: Mon, 18 Mar 2024 16:55:16 +0000 Message-Id: <20240318165545.3898-8-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Otherwise, the change to the config file isn't taken into account until the next reboot. Signed-off-by: Anthony PERARD --- ts-host-install | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ts-host-install b/ts-host-install index 00277485..43ed9285 100755 --- a/ts-host-install +++ b/ts-host-install @@ -152,10 +152,12 @@ END my $ntpserver = get_target_property($ho, 'NtpServer'); if ($ntpserver) { my $ntpconf_path; + my $ntp_service; if ($ho->{Suite} =~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) { $ntpconf_path = '/etc/ntp.conf'; } else { $ntpconf_path = '/etc/ntpsec/ntp.conf'; + $ntp_service = 'ntpsec'; } target_editfile_root($ho, $ntpconf_path, sub { my $done= 0; @@ -173,6 +175,9 @@ END } $done or die; }); + if ($ntp_service) { + target_cmd_root($ho, "service $ntp_service restart"); + } } host_install_postboot_complete($ho); From patchwork Mon Mar 18 16:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595604 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E218C54E58 for ; Mon, 18 Mar 2024 16:56:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694949.1084320 (Exim 4.92) (envelope-from ) id 1rmGHJ-0004UF-N1; Mon, 18 Mar 2024 16:56:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694949.1084320; Mon, 18 Mar 2024 16:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHJ-0004Rc-AM; Mon, 18 Mar 2024 16:56:01 +0000 Received: by outflank-mailman (input) for mailman id 694949; Mon, 18 Mar 2024 16:55:59 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHH-0002gq-5j for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:55:59 +0000 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [2a00:1450:4864:20::135]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 64ba9c06-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:55:58 +0100 (CET) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-513cf9bacf1so5801653e87.0 for ; Mon, 18 Mar 2024 09:55:58 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:57 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 64ba9c06-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780958; x=1711385758; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o+3r6fYzaXB3N/0rnw9Q6VwH4rxmenmG4TwlfD9Xy8Y=; b=Q6EO40YoRoSjpW7nAvt7U5MVyD80Rj+W+7bGB8X3c2psbCFmVcHGVOhm2P7tJrqtfC fZzM9VD6PvEwo2nwmzMKpm8yJPX2yqzptwOaAQHVO5nz4HTpV/itbJRucPep9Wa/YHpx yhkif0uYucWv9JDjJp7CXqhnfsZfenCJcq7rQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780958; x=1711385758; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o+3r6fYzaXB3N/0rnw9Q6VwH4rxmenmG4TwlfD9Xy8Y=; b=XHb6PTvcL+t6ynPLzF7ixAdgY2JcV4Gm2DFmTRr7BKmb1YrynhKfWLohl0V6eRAaWZ HffL440n2cTgPrjtB1xrio6EWn7AK4tNneEGuY5iBcFqUzk+bzIPAdVXoOODPGj5ou1G FlANnyEnjpTarln/XQmOskxEcBPT/zGDjR0WMsOOlf06/v0X9BwdSu+kE4uNBfuP0Gp5 JfSKgBsIiqf1hgwEvf++m1er7/0Lu/CvsDlDN6qrXEmwUdz/CMRhcEdpx9Y7jao5sVb5 PmHK1gUwk/XiNWV2Pl+VkxwytaO1whKi5ZSo7tp7yh6s4zYcq4C8GPvr8aBISoGqxIOn 6vdQ== X-Gm-Message-State: AOJu0YyS0G3DSJ7BBdrUUJOWu3k5KZp3ldT0DfL+aOw3GlCZwl+IXpf4 1PAeXzVTMzTEYOFDiZHHe//7GE/myMXpT3ARczwBr++OBMsWizev86tYqvYZVG0Wf1dRwMbNpCv N X-Google-Smtp-Source: AGHT+IG1aAUVttrMa2HZLGh7dogu1uNzjjZjmygv0wIoIGvDALRczq05npI7tR7zVopl9a66vng+NQ== X-Received: by 2002:a05:6512:3b4:b0:513:5a38:f545 with SMTP id v20-20020a05651203b400b005135a38f545mr7392334lfp.62.1710780957661; Mon, 18 Mar 2024 09:55:57 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 08/36] preseed_create: Use new "d-i grub-installer/update-nvram" for UEFI installation Date: Mon, 18 Mar 2024 16:55:17 +0000 Message-Id: <20240318165545.3898-9-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Instead of "grub-installer/no-nvram" proposed in Debian bug #789798, we have "grub-installer/update-nvram". Make use of it, and remove workaround. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 9b30a375..7d6f9778 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1550,13 +1550,17 @@ d-i partman-auto/expert_recipe string \\ lv_name{ dummy } \\ . +# Prevent grub-install from making a new Debian boot entry, so +# we always reboot from the network. +d-i grub-installer/update-nvram boolean false END - if (get_host_property($ho, "firmware") eq "uefi") { - die unless $ho->{Suite} =~ m/jessie|stretch|buster/; + if (get_host_property($ho, "firmware") eq "uefi" && + $ho->{Suite} =~ m/jessie|stretch|buster/) { # Prevent grub-install from making a new Debian boot entry, so # we always reboot from the network. Debian bug #789798 proposes a - # properly preseedable solution to this. + # properly preseedable solution to this. Implemented with + # "grub-installer/update-nvram". preseed_hook_installscript($ho, $sfx, '/usr/lib/base-installer.d/', 'osstest-disable-grub-nvram', <<'END'); From patchwork Mon Mar 18 16:55:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595602 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EEA9FC54E74 for ; Mon, 18 Mar 2024 16:56:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694950.1084324 (Exim 4.92) (envelope-from ) id 1rmGHK-0004Zi-1P; Mon, 18 Mar 2024 16:56:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694950.1084324; Mon, 18 Mar 2024 16:56:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHJ-0004YS-Os; Mon, 18 Mar 2024 16:56:01 +0000 Received: by outflank-mailman (input) for mailman id 694950; Mon, 18 Mar 2024 16:56:00 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHI-0002gq-5s for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:00 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 64fec057-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:55:59 +0100 (CET) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-41412e6b2cfso6571435e9.2 for ; Mon, 18 Mar 2024 09:55:59 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:58 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 64fec057-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780958; x=1711385758; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=grbljEezuAm5ddIqYTUtOOXKigH5i2pAC4iRghVwmV8=; b=uFtFhacI1Tirk2+ueChZwlsWpbCfd8EAwBzCp065BpQYj7Zri/Fodo8L1byVGBQCPa vucCJRMcu9+M0skDeP6U+D2cJo5DTM9Boh2USyXDjtg6J9yasbG0SQy6b7r4+hWEf8dF NnC1d0v7uZHaoYlPiP0l3qauuxoMi4wJtEryA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780958; x=1711385758; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=grbljEezuAm5ddIqYTUtOOXKigH5i2pAC4iRghVwmV8=; b=rMLcIKIs9t6SGhjkSZjCiexoJY0lagmDYw4s+ip4po/5WteMeXYYi5zH+pC9fPd/yP m07z8YT7AtTCxE3En+0pGCGkkrErTeoI7lIPfSWqq7Oi6P7I1oEY0OCrhXKoZFjV+vS1 9ajfnkUR739qEmBuC5oNDSNUSI/9CKXQ0QWCatKxyCLQaHKIh1VNWHZjpJHQjQlNi1Ur 5qPjkZEusoJLCMWOrYVxVwHfxiUbWsNl94o8zQlXMECGJinoKn/ZyM1bhbRk8raWNDho b5LUZ+vkEMM3eJMuVskP6KlZNdOuMrAGtPQymVACEDm1RPjMXKjA25zuZ/MJ8nSGJDq7 zwSg== X-Gm-Message-State: AOJu0Yx6L0F9EjKcabJmer3mQUwjoylY+5c0reMf3ktm4KhZKT4w9n1c IunjZ75XN7GItb9WFlQRL/Kp2ctNSXmTNWnhd5SRYl0nESuUOFoHWaE0Bh7+57v/kN1ilt7h4lZ 3 X-Google-Smtp-Source: AGHT+IFcgQCr2cM6JQpN9LZSX9YsTNRBfrJdElRzDqs5E9G5lzKWHqiz3bxuJX78jdQgzxXOg7YuBg== X-Received: by 2002:a05:600c:4fd1:b0:413:f276:778b with SMTP id o17-20020a05600c4fd100b00413f276778bmr9778329wmq.23.1710780958404; Mon, 18 Mar 2024 09:55:58 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 09/36] preseed_create: osstest-erase-other-disks: workaround creating /dev/sdXD files Date: Mon, 18 Mar 2024 16:55:18 +0000 Message-Id: <20240318165545.3898-10-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Sometime, it can happen that the erase-other-disks script fails and indicate that /dev/sda1 isn't a block device anymore. This happened when /dev/sda was erased before /dev/sda1. So to avoid this, we will zero the partitions of ${disk} first, and hopefully the error won't happen again. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 7d6f9778..36c05551 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1305,7 +1305,7 @@ for sd in sd hd; do udevadm settle log "\${sd} devices present after: `echo /dev/\${sd}*`" done -for dev in ${disk}*; do +for dev in ${disk}?* ${disk}*; do zero done echo === From patchwork Mon Mar 18 16:55:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595605 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72E9CC54E71 for ; Mon, 18 Mar 2024 16:56:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694951.1084337 (Exim 4.92) (envelope-from ) id 1rmGHL-00050t-J8; Mon, 18 Mar 2024 16:56:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694951.1084337; Mon, 18 Mar 2024 16:56:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHL-0004zE-6j; Mon, 18 Mar 2024 16:56:03 +0000 Received: by outflank-mailman (input) for mailman id 694951; Mon, 18 Mar 2024 16:56:01 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHJ-0002f9-BO for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:01 +0000 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [2a00:1450:4864:20::135]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 657dfe6c-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:55:59 +0100 (CET) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-514a8259ec1so719867e87.1 for ; Mon, 18 Mar 2024 09:55:59 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:58 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 657dfe6c-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780959; x=1711385759; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HskY0/rWAkkufGRUO0YcZLuEXfDnS48xXAIqv0EwLpg=; b=vS/4wiK66x/6cLaBRMZXfUvkO/GS0JmziU31NoR+GqY1gasTCaLVimz5j4xHaElAIt roz0WVY35ID7XGC7SEvf9xojbHfTlgo8PZ95ouohfDAtWeQsmIXGRUsZSpS6OvT97uTq 0Z9l45is0QCqqleKesSpDJQ1IxMrNENi1TOJo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780959; x=1711385759; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HskY0/rWAkkufGRUO0YcZLuEXfDnS48xXAIqv0EwLpg=; b=EC9Dx8fVp4sETflQHtJCLg4xpveV00SyeI64e8+iZKS+l/Bbn62sRjOki9h5pCagwL f2Ung7fbB/+uyvE9HV6FjsRoKf/gxXUsgLkoR9pMQkUckX6f5XqOn89e5nkRUD13YD16 xeCOB603dd/BITIn/74+IC2eG65HaqBo5gBMt913XiGLPqCUfEZrNh01o+mnUU2A2D+1 e7uqYg/OAdYsBGCGQS582fOQ821dzZVz5aAf3lDbHmrzL7Ay8Q5TzTs0VOq+45QsQKMp e4c8EKEycEwOnTk+BFENoMb5mzTHCzfyseEsGlrnSczcNVmynZmaPAkAqCogS3NG2dkX 4/XA== X-Gm-Message-State: AOJu0YweOBRDPZAjq1+/4gZMijm/5l9e8OhIdey84AUygi421pyUM20j EAVOy4UlBYyOs2/ZaaBYcrNcevAYwt0V/prBgOMc+EDT8ZL3A7fbBKnQuqBSuWbr247i5GoKX02 H X-Google-Smtp-Source: AGHT+IHissgjFavvd6I0K4K1XuCGNtvIVz2ecBEftkAlbPre0cCi0ljKz4wdjFPFtf1vPgXDoCXldA== X-Received: by 2002:ac2:4985:0:b0:513:9f14:8f73 with SMTP id f5-20020ac24985000000b005139f148f73mr8121706lfl.36.1710780959342; Mon, 18 Mar 2024 09:55:59 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 10/36] preseed_create: Workaround fail grub-install on arndale Date: Mon, 18 Mar 2024 16:55:19 +0000 Message-Id: <20240318165545.3898-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 grub-installer on arndale-* machine fails with Debian Bookworm. It tries to install "grub-pc" which doesn't exist. Skip installation. Somehow, cubietruck-* installation works fine. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 36c05551..98b2fc86 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1581,6 +1581,14 @@ chmod +x /target/$t END } + if ( $ho->{Flags}{'need-uboot-bootscr'} && + $ho->{Suite} =~ m/bookworm/) { + + # grub-installer fails on the arndale machine, it's trying to install + # "grub-pc" which doesn't exist. Skip installation. + $preseed_file .= "d-i grub-installer/skip boolean true\n"; + } + $preseed_file .= preseed_hook_cmds(); if ($backports_kernel || $ho->{Flags}{'no-di-kernel'}) { From patchwork Mon Mar 18 16:55:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595603 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5C867C54E5D for ; Mon, 18 Mar 2024 16:56:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694952.1084341 (Exim 4.92) (envelope-from ) id 1rmGHM-00056B-7u; Mon, 18 Mar 2024 16:56:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694952.1084341; Mon, 18 Mar 2024 16:56:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHL-00053s-MD; Mon, 18 Mar 2024 16:56:03 +0000 Received: by outflank-mailman (input) for mailman id 694952; Mon, 18 Mar 2024 16:56:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHK-0002f9-Ff for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:02 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 661a90c1-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:01 +0100 (CET) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4146172fb7eso2494145e9.1 for ; Mon, 18 Mar 2024 09:56:01 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:55:59 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 661a90c1-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780960; x=1711385760; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d6vqIoo60jsb5f3ItIQP3yygc1lD7+80VS35yrYdlSk=; b=NBpSb9Zy9fcZf7XOo2paKA3TvdUru2Z273ukor5lUiEr4y/owK2TuwNdO5OV4lOAFE ZAhWS7zO9LtUYjkZcMb6V7Tvl0YQ/xRu22JVeACw6X0pUijAWuih8Sf5LGCl39yjlW1E AYEezZEt722zY9Ef/YA3tsVYgISjXz0HjZ1q8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780960; x=1711385760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d6vqIoo60jsb5f3ItIQP3yygc1lD7+80VS35yrYdlSk=; b=koJqsTHUZZZC5eVYXnmw0PT7RDyvPomWAbSO8EQ6Be6yPDbKp5FnMdAjJdtThZhOnS d0g1P85SOIjyksGriuHxVrnIY99ICEgVjLOgS7B+8g21iTydwPejmhGoMNYEeEeNlSjE TrfDTkIdG5pNukmLN1pJeHJ6j5T4Gi1rxBZuER1bCZoeviJ5PMtMQCzfTXzng1NoAxuN 8BypxF03xrVTXYEXEmuQLQNePAFILZRFbyTbXaIB3BUvtqslhnLKkyiM0HgoMSUEJbO1 Y89tKELwQ1lPzWn9ehXQXfiY5/l0ZjEj1QXn4cbJn9Fc5MDqqOI76yea7C+h7HAN7fom pxAw== X-Gm-Message-State: AOJu0YwZs6pCIskhK/Ef7XtfWDbUe5hYDQbLBSh4m86xL7wLaxsHXtEG oGMtL8R1i3TKDfmxkMB84g2i9sAI7YIFO3XiApRbc6N7niiTpKG9WlgJ2s7doQ2E21f2/PYdjuX B X-Google-Smtp-Source: AGHT+IGVmI7hoax2kO6sT8eGLuG8aUxlCuwOu7OpEtCC+15tMFQlCVmk8irXv/63DlcF208QG7thSQ== X-Received: by 2002:a05:600c:3588:b0:413:160b:fcb2 with SMTP id p8-20020a05600c358800b00413160bfcb2mr6727710wmq.30.1710780960269; Mon, 18 Mar 2024 09:56:00 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 11/36] ts-host-install,preseed_create: Do lvm vgextend at install time Date: Mon, 18 Mar 2024 16:55:20 +0000 Message-Id: <20240318165545.3898-12-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 When there's more than one disk, like the "pinot?" machine, the name assigned to e.g. "sda" may change after a reboot, at least when installing Debian Bookworm, which is using Linux 6.1. I believe Linux probes disk controller in parallel and assign "sda" to the first controller to respond, or something like that, so disk aren't assigned a name in a predictable order. So, instead of extending lvm volume group to a new disk on reboot, do that at install time when we know that lvm is on sda. Alternatively, we could try to set "d-i partman-auto/disk" with a list of all disk, but that would mean knowing all the disk before starting the machine. This new shell script in /lib/partman/finish.d/ should work in all debian, so replace the script in ts-host-install by this new one. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 21 +++++++++++++++++++++ ts-host-install | 9 --------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 98b2fc86..14ec2293 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1312,6 +1312,27 @@ echo === set +e ls -l /dev/sd* true +END + + # Extend lvm vg to other disks + preseed_hook_installscript($ho, $sfx, + '/lib/partman/finish.d', '99extend-vg', < X-Patchwork-Id: 13595607 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C08C9C54E58 for ; Mon, 18 Mar 2024 16:56:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694954.1084357 (Exim 4.92) (envelope-from ) id 1rmGHO-0005Uw-OY; Mon, 18 Mar 2024 16:56:06 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694954.1084357; Mon, 18 Mar 2024 16:56:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHN-0005P6-Q9; Mon, 18 Mar 2024 16:56:05 +0000 Received: by outflank-mailman (input) for mailman id 694954; Mon, 18 Mar 2024 16:56:03 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHL-0002f9-5l for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:03 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 669a38fd-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:01 +0100 (CET) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-513cf9bacf1so5801720e87.0 for ; Mon, 18 Mar 2024 09:56:01 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:00 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 669a38fd-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780961; x=1711385761; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rd9iUaTqxVeuY65CjLGL6cDo2UmB5wPhRHB/vSr/mm0=; b=tNh1J3lEzrqY8SlbTejF3KRU7H5V3RAdDfPgeOeiEcCniSLtEJ/D6m7lfgWVGxh5kH NLzTfW/XfYQdluRpr9Dvfpq/ZfyYcy/PoWp/kIuMxtfCPMnNJKaj4GdpsRs8JD8GCF0w 8GjBq0Gc0pZM4EuRyiZWzRdob7VEXcbppvP0Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780961; x=1711385761; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rd9iUaTqxVeuY65CjLGL6cDo2UmB5wPhRHB/vSr/mm0=; b=SNW8B42qZipSA4aXqL2KBcKN2bXARaypmorNtywM3VJJ/oZru8YwGZepDC02RIxNEj 1M4BlG4Z6gSptiRlYm5M9T8zI4vBXCK6D2CRQVFp66G7ZZx8VE8wafY4pRVVqO7aZXMd XOSZ1V69MYGNtkX+HrwDCdJD6cncnWmQFtolE70laqK63Wu/ZW/ujOzX085kdphlDaTf 86PJFj/Amut6+5me4TLLVllni/emeOvLwV3Q/0YLM0hmLtrHYQTi1ckwJvM4kYUkRhnl 2jJM/aA+H9Kr43ulIGCre4fcko++Z0sFKqbB0DqbtU3MG+6q9T8aJ65MpRbNkePK8DoE hpHw== X-Gm-Message-State: AOJu0YzIM6FLh4cHr967psuCtN7ovf5q+jCM/AkoS1SYHedIYqznBIvd 8hVDwekqdNyXixUw/aTvI/wibD6RBHq5kK9+Va+UEy9bh/pxmos/wB5tmN+WCbx5t9BxIZIJoyO 8 X-Google-Smtp-Source: AGHT+IHlMI0WDpjOGMDmBg0WcpDF0MYnwJqnd2kHpPPrEe/KcP+Vq3g2qp8yYST2nrjesKhVRsX19g== X-Received: by 2002:ac2:5047:0:b0:512:bf99:7d80 with SMTP id a7-20020ac25047000000b00512bf997d80mr7427974lfm.1.1710780961046; Mon, 18 Mar 2024 09:56:01 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 12/36] di_installcmdline_core: Add link_wait_timeout to install cmdline Date: Mon, 18 Mar 2024 16:55:21 +0000 Message-Id: <20240318165545.3898-13-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 The default wait time of 3 seconds isn't always enough get an IP from the DHCP, give more time to the installer to find a NIC that works. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 14ec2293..cf5a3bd1 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -723,6 +723,7 @@ sub di_installcmdline_core ($$;@) { "hostname=$tho->{Name}", "$xopts{PreseedScheme}=$ps_url", "netcfg/dhcp_timeout=150", + "netcfg/link_wait_timeout=10", "netcfg/choose_interface=$netcfg_interface", ); From patchwork Mon Mar 18 16:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595606 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AA45FC54E72 for ; Mon, 18 Mar 2024 16:56:13 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694953.1084349 (Exim 4.92) (envelope-from ) id 1rmGHN-0005IJ-CN; Mon, 18 Mar 2024 16:56:05 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694953.1084349; Mon, 18 Mar 2024 16:56:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHM-0005De-NL; Mon, 18 Mar 2024 16:56:04 +0000 Received: by outflank-mailman (input) for mailman id 694953; Mon, 18 Mar 2024 16:56:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHK-0002gq-Ud for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:02 +0000 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [2a00:1450:4864:20::135]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 670cf8ff-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:02 +0100 (CET) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-513da1c1f26so5002614e87.3 for ; Mon, 18 Mar 2024 09:56:02 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:01 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 670cf8ff-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780962; x=1711385762; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2v7zAAUJTcHPnQWXPNIf3DNM+jdDTySTxnOrx9fx8gI=; b=SEsFMIhNJRYmVzF0aUM05JGCAUoRxpGvFltsmBKxpzd2GqvuEnpNfCC9UF+A0goe7w ZxgZJ5Ws7oxo6t0qMnc33c0t6Yr6dWGzPcFBreQWW4jIykiPmhpCsk4s8v5fbuXEdqp5 Z2ATGOxYNEh2P9BjLF/MXl8n92a9wO02vE1gE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780962; x=1711385762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2v7zAAUJTcHPnQWXPNIf3DNM+jdDTySTxnOrx9fx8gI=; b=cfS2Qm5rStoUaDewrQvWU0p4/NKD30uTCvm3X3RD5ycaEe0acyXNGhO13ygFzAqjJy a4nB7gOG2eltieZ/6lb1HZGez7eEAlpTbVDD5Kh9w+M9XHHc3xNJnMlnyD0rzeJ7ribV DUoGL/54sAvuqlhcLzno2iYGXZ6SQJPs06pOCl0bQ5y2r00KhdMOjOnEjMa8URAR21ky Fe5pmUCdzxMOGQn6e/vSbH6A/5QVTd9QntIpAtZlioZUZ/t2Jd5wxxvxCu3FQPGvp7N/ dzxulO+wsd17rEZP3stSZdm/NLM+G4u4/kq5igIrupHyhUCZUVxOhOyMge2+aF/eELfk tu2g== X-Gm-Message-State: AOJu0Yxo+loR+qmM8Kp9rAI2HNrXSd8XWiAZgmYTzLgfQMXPG7xB4iew B2BV56A+my94suYki1wRhJbEqsQY6xMG+pcaiia9KsWMrpKIh0fQDNo6b5yy7nxjg4bQI6gZ4fS a X-Google-Smtp-Source: AGHT+IEVe9Iy8l1iOZhUjc/dwpqS9uIw7e2EYiEnDJrFJCr6GwYqghYVQZd1C0pbnwZcEwEgPhUZCA== X-Received: by 2002:a05:6512:21cc:b0:513:27a1:24cb with SMTP id d12-20020a05651221cc00b0051327a124cbmr7433132lft.51.1710780961922; Mon, 18 Mar 2024 09:56:01 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 13/36] Disable persistent net generator on Bookworm Date: Mon, 18 Mar 2024 16:55:22 +0000 Message-Id: <20240318165545.3898-14-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 This schema doesn't work. Even if the udev rule is there, the name of the different NIC are different from one boot to the next. On a machine (sabro*) with 3 different NIC, the name of each interface is basically random and could take on of three name, "eth[0-2]". net.ifnames=0 does still mean that we have "eth*" names, but the generated file "75-persistent-net-generator" doesn't seems to name the interfaces as expected. The new predictable network interface names schema seems to work well enough. The names are still the same after rebooting into Xen, at least on the few machine tested so far. But, we will change to a "mac" name policy in a follow-up commit. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 12 +++++++----- ts-host-install | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index cf5a3bd1..102b0246 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -87,10 +87,12 @@ sub debian_boot_setup ($$$$$;$) { $kopt .= ' '.$targkopt; } - # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ - # In fact these are anything but predictable. We use the scheme - # from Debian jessie and earlier, persistent-net-generator etc. - $kopt .= ' net.ifnames=0'; + if ($ho->{Suite} =~ m/stretch|buster/) { + # https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ + # In fact these are anything but predictable. We use the scheme + # from Debian jessie and earlier, persistent-net-generator etc. + $kopt .= ' net.ifnames=0'; + } foreach my $hook ($hooks ? @$hooks : ()) { my $bo_hook= $hook->{EditBootOptions}; @@ -800,7 +802,7 @@ sub debian_overlays ($$) { # network device names', is the default; but it is anything but # predictable, so we disable it. Instead, we restore the # 75-persistent-net-generator mechanism from jessie and earlier. - $maybe->("overlay-persistent-net") if $ho->{Suite} !~ m/wheezy|jessie/; + $maybe->("overlay-persistent-net") if $ho->{Suite} =~ m/stretch|buster/; $maybe->("overlay-$suite"); $maybe->($c{OverlayLocal}, 'overlay-local.tar'); diff --git a/ts-host-install b/ts-host-install index 17a1bf78..88481038 100755 --- a/ts-host-install +++ b/ts-host-install @@ -214,7 +214,7 @@ sub setup_netboot_firstboot($) { system qw(rm -rf --),"$initrd_overlay.d"; mkdir "$initrd_overlay.d" or die "$initrd_overlay.d: $!"; - if ($ho->{Suite} !~ m/wheezy|jessie/) { + if ($ho->{Suite} =~ m/stretch|buster/) { my @cmd = (qw(cp -dR overlay-persistent-net/.), "$initrd_overlay.d/."); logm("using persistent-net-generator: @cmd"); From patchwork Mon Mar 18 16:55:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1A27AC54E6A for ; Mon, 18 Mar 2024 16:56:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694956.1084375 (Exim 4.92) (envelope-from ) id 1rmGHR-0006Bo-HL; Mon, 18 Mar 2024 16:56:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694956.1084375; Mon, 18 Mar 2024 16:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHQ-00067z-VG; Mon, 18 Mar 2024 16:56:08 +0000 Received: by outflank-mailman (input) for mailman id 694956; Mon, 18 Mar 2024 16:56:05 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHM-0002f9-Qb for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:04 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 67824e16-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:03 +0100 (CET) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4140edd58c9so10184315e9.2 for ; Mon, 18 Mar 2024 09:56:03 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:02 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 67824e16-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780962; x=1711385762; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jEUzBm46DKDKIcvqZl7uzOx5U6pv71UqK2TcBX4GGFk=; b=h9N8BBsCRGmvBpDRoPOylUJn9KpiAdSIkC+GOlD/6yyPdRjiozWa2JN7Ey2JOtHTDT 2/Xbc7zepa1/GSkOKdGiIZrA+Fh3JxwgyZUu/yWgKQF+L1FfANO23vrzPt54mPRYXMqC sETdIsY1IWxwlePqXgUO850uVE7xxzA8x+HUw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780962; x=1711385762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jEUzBm46DKDKIcvqZl7uzOx5U6pv71UqK2TcBX4GGFk=; b=OKpxNWQ2KomxiM3f9HN3pfZj/zgf91o+wHgEC7yrRvAW2xaspjgB+lGY/mb8iYNNdl FQt3LH3oiyE8N5gq7lvbgEgyX9bBkIUfLyFPpaX7QrGUnpSy0YWmZJYPuW//XdyUfQB4 LRA8sLh6POzdGPMK7VeNtu9+Ellp0BbVeIOMXzT8oaIilHhMlfAEYO8qxLrcbeKcJm7g UbgkO0J8PhqxQZT5xd0uWk8MJpFfioRJa6ll0W0kY8YhmDRgM0JlHnAVVS/uMdhvP1vM UfdDHxBAFHjoh/g5R0nW++M7x5pKDFRwItebHt23efwZNyMI+wqpWekipq5qXNz2NAEN zFjQ== X-Gm-Message-State: AOJu0YwwqCtnznJqRs8vkzweHM+K4PoI5d3PuUBjuc8alz0z1ec85iPI zXTUywlUK5BzTXiBV94YIk0rp0FsZnoI3IBn3fPSHaSRVNy4N7WiGwGrFMTRVowLjJcSDXImIEG n X-Google-Smtp-Source: AGHT+IHzbkjiHlHlbmYcOmyi2Ux5us6fmp/TDFt1UIjlqO3csZ1DIXqrVicrgzK5/h4a2vfbgqdK1g== X-Received: by 2002:a05:600c:16d3:b0:414:a75:7457 with SMTP id l19-20020a05600c16d300b004140a757457mr59490wmn.10.1710780962746; Mon, 18 Mar 2024 09:56:02 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 14/36] preseed_base, ts-host-install: Change NIC NamePolicy to "mac" Date: Mon, 18 Mar 2024 16:55:23 +0000 Message-Id: <20240318165545.3898-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 On "italia?" machine, the two network interfaces are competing to have "eno1", base on the "onboard" naming policy. So the name of the network interface can change between "eno1" and "eth0". Switching to "mac" should avoid the unpredictable name based on "onboard" or "slot" policy. The "mac" naming policy break `vif-bridge` for the "vif*.*" network interfaces. So we will avoid the "mac" policy if the driver is "vif". This also have an impact on guest created with ./ts-debian-install, as they use the initrd from dom0, so the interface in the guest will be renamed according to default policy (which rename eth0 to enX0). Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 22 ++++++++++++++++++++++ ts-host-install | 16 ++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 102b0246..31d32d6f 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -962,6 +962,28 @@ cp /$RULESDIR/70-persistent-*.rules /target/$RULESDIR 2>/dev/null || true END + if ($ho->{Suite} !~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) { + # Always use MAC address in network interface names. + # + # But keep the default policy if the driver is "vif", which match the + # "vif$domid.$idx" interface in dom0, and the interface in domU. This file + # is going to be added to dom0's initrd, which is used by some guests + # (created with ts-debian-install). + preseed_hook_installscript($ho, $sfx, + '/usr/lib/base-installer.d/', '05ifnamepolicy', <<'END'); +#!/bin/sh -e +linkfile=/target/etc/systemd/network/90-eth-mac-policy.link +mkdir -p `dirname $linkfile` +cat > $linkfile <{Suite} !~ m/lenny|squeeze|wheezy|jessie|stretch|buster/) { + # Switch to more predictale nic name based on mac address, instead of the + # policy "onboard" which can try to set the same name ("eno1") to two + # differents nic, or "slot". New names are "enx$mac". + system_checked(qw(mkdir -p --), "$initrd_overlay.d/lib/systemd/network"); + file_simple_write_contents + ("$initrd_overlay.d/lib/systemd/network/90-eth-mac-policy.link", + < X-Patchwork-Id: 13595608 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BD198C54E5D for ; Mon, 18 Mar 2024 16:56:17 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694955.1084369 (Exim 4.92) (envelope-from ) id 1rmGHQ-0005wC-Lo; Mon, 18 Mar 2024 16:56:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694955.1084369; Mon, 18 Mar 2024 16:56:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHP-0005t5-QB; Mon, 18 Mar 2024 16:56:07 +0000 Received: by outflank-mailman (input) for mailman id 694955; Mon, 18 Mar 2024 16:56:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHM-0002gq-Jp for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:04 +0000 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [2a00:1450:4864:20::32e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6800ac7f-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:04 +0100 (CET) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4141156f245so7505795e9.2 for ; Mon, 18 Mar 2024 09:56:04 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:03 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6800ac7f-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780963; x=1711385763; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Pq6eeei87hao7bl7kATMciqySzcOcwgBpySkkkByHOs=; b=rn7auk2HZy3B9Sy5+rqED9hAN1EyCfJHQxUwvVcWMpzyufxLBeSFescbKS+MjeEpPr h5A/U1Ak0DdKbHEKY9wj1SRjGkdMHjZvkH/2oXaYVryZYVkEgic8aI/S/kx3+lSm18h6 A1oOIfVxP5Pb4U/f/1rf1hJqaFwM+IRLfCQAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780963; x=1711385763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pq6eeei87hao7bl7kATMciqySzcOcwgBpySkkkByHOs=; b=ZtBPw0MluhC8zV27hWMLFJvvOy+R6P5SpI2piegVDAvpJK3DVkuHyJzbmdt10vdujc rUhUAKxWbg52BX1naor927CR86GSCS49QGy/EAo7Zoha32WKjEVHkg6sC57MhtSGPKva 5NzAzwgNaUUIR3NQ3vZabCji90k37ihEW805vJCfMqTM0hOi5Nl+pxaEo4xrQQ1dw490 W/cLj1xiCzkb5CZLY4jFekPW73E7Mry3kaRHSdkx8pMKfaRv36M4RKAhEmkaiOsNFT4g st5/zcFTIvcwSxgHpcXGFFF1p+Puma7Uxqy9tTKMm3mqOThis8V1w6iQTPpdb9DpXIFk CLFg== X-Gm-Message-State: AOJu0YwNOqHmn4gLIZPOSC0c1Uk0/gs2Fm9jEGK+iuf4/Rt35MDPa+XK /gUFLqakByfCfzPU0NWInQGENefoCLPKDGU/p60l8O/REQzZWpTSKlIXDburlEUYWLjVmfUW0Ku n X-Google-Smtp-Source: AGHT+IGgDcQtvTM654d+tmeQwanSCT3po+N15r+1TYDul4GhmRBvO3zeGNYA2qI7rJvbettoAmpKdQ== X-Received: by 2002:a05:600c:3587:b0:414:37f:26d with SMTP id p7-20020a05600c358700b00414037f026dmr6667536wmq.10.1710780963384; Mon, 18 Mar 2024 09:56:03 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 15/36] ts-xen-build-prep: Change package selection for Bookworm Date: Mon, 18 Mar 2024 16:55:24 +0000 Message-Id: <20240318165545.3898-16-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 python-dev: It doesn't exist on bookworm, and python2 shouldn't be needed anymore. libsdl-dev: On buster this already select "libsdl1.2-dev", but to not change buster installation we will only use the new package name on Bookworm. Signed-off-by: Anthony PERARD --- ts-xen-build-prep | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ts-xen-build-prep b/ts-xen-build-prep index 547bbc16..48d3fb75 100755 --- a/ts-xen-build-prep +++ b/ts-xen-build-prep @@ -200,9 +200,9 @@ sub prep () { my @packages = qw(mercurial rsync figlet build-essential bin86 bcc iasl bc flex bison cmake ninja-build meson - libpci-dev libncurses5-dev libssl-dev python-dev + libpci-dev libncurses5-dev libssl-dev libx11-dev git-core uuid-dev gettext gawk - libsdl-dev libyajl-dev libaio-dev libpixman-1-dev + libyajl-dev libaio-dev libpixman-1-dev libglib2.0-dev liblzma-dev pkg-config autoconf automake libtool xsltproc libxml2-utils libxml2-dev @@ -229,6 +229,12 @@ sub prep () { push(@packages, qw(texinfo autopoint libpciaccess-dev)); } + if ($ho->{Suite} =~ m/squeeze|wheezy|jessie|stretch|buster/) { + push(@packages, qw(python-dev libsdl-dev)) + } else { + push(@packages, qw(libsdl1.2-dev)) + } + # The in-tree ext4 support in libfsimage can't cope with 64bit ext4 on # 32bit build. Use the packaged library. if ($ho->{Suite} !~ m/squeeze|wheezy|jessie/) { From patchwork Mon Mar 18 16:55:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595636 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 707D4C54E5D for ; Mon, 18 Mar 2024 17:05:36 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695008.1084517 (Exim 4.92) (envelope-from ) id 1rmGQS-00024T-SZ; Mon, 18 Mar 2024 17:05:28 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695008.1084517; Mon, 18 Mar 2024 17:05:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGQS-00024J-Nx; Mon, 18 Mar 2024 17:05:28 +0000 Received: by outflank-mailman (input) for mailman id 695008; Mon, 18 Mar 2024 17:05:27 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHO-0002f9-RL for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:06 +0000 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [2a00:1450:4864:20::135]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 686d457a-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:04 +0100 (CET) Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-512bde3d197so3808604e87.0 for ; Mon, 18 Mar 2024 09:56:04 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:03 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 686d457a-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780964; x=1711385764; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zGc/tAE3LgxqS6yxs5mnzZ81H1ykyZF+fgjzTHt3zAQ=; b=Nd7SeoJXvkdESDP60rFSRMmR9KNgA2BYQDVen8y2Hda2mT39d+Q7LiGq/SVJiGQKw0 ZIvMN/Crj4rTu0TWLSkZHf6575grTYzTFd2ESQEQe3MS/miTFBmaeDy1dEO1cS4rB/1r a/H+Rjlh4llPM/v69zR1xEq47cdp294e6HGOA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780964; x=1711385764; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zGc/tAE3LgxqS6yxs5mnzZ81H1ykyZF+fgjzTHt3zAQ=; b=XmOXhpPnU1edc43N1nj4BZH+rHF9EhP9DyysX5uEH1yaNQMnYC39ynFSk6/WuYiZ6O LQmglwagxJew03InhpgVyh2nXSTeqnVDP8FdeQOxeMJ7ST0DcJ1uCeblbpKTXDpiPjMF V0u3NYcALtL2Jt1x937cuLyE2tZVo22K6YuesRA9XzULVCYNuapmVP237nFN5zR1qyO/ 9q9Go6sku/dCKwlRBqdFcr+FDmxalj+8kG+oCvk9SFCx5Dg01J/Xu9t00m92nCj0TwkE 1wduckaCOCOf9f7+bGVCnGP2uOaPCWg3Eo2+PtGocNkl/+QW5DSgh5HduyJo3uXhLs7G h79w== X-Gm-Message-State: AOJu0YxezwlVrj9umP+jm4fuD3KPbyngdQy76fuHIVghV+0ZyIjtm8Xi jgwc77R7tFeQbcqPHSMmkvV8vmMeKv0PYHPTDH11y5XUbNIJQR/feL2nLoJtrO2yjqgAa8cyJWE S X-Google-Smtp-Source: AGHT+IHv6ANcOL3/Tor8yfkblZa2vNFikZkiCQfGeZEkPIbXlpNbaAn/WfluD2+T4+nnF2yU4d5yaQ== X-Received: by 2002:ac2:464c:0:b0:513:e27c:78f0 with SMTP id s12-20020ac2464c000000b00513e27c78f0mr49422lfo.46.1710780964279; Mon, 18 Mar 2024 09:56:04 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 16/36] bl_getmenu_open: Read grub.cfg as root Date: Mon, 18 Mar 2024 16:55:25 +0000 Message-Id: <20240318165545.3898-17-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 On bookworm, "/boot/grub/grub.cfg" isn't accessible by user "osstest", so read the file as user "root". Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 31d32d6f..57f31977 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -139,7 +139,7 @@ sub debian_boot_setup ($$$$$;$) { sub bl_getmenu_open ($$$) { my ($ho, $rmenu, $lmenu) = @_; - target_getfile($ho, 60, $rmenu, $lmenu); + target_getfile_root($ho, 60, $rmenu, $lmenu); my $f= new IO::File $lmenu, 'r' or die "$lmenu $?"; return $f; } From patchwork Mon Mar 18 16:55:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595639 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA09EC54E5D for ; Mon, 18 Mar 2024 17:06:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695023.1084546 (Exim 4.92) (envelope-from ) id 1rmGRU-00043h-NL; Mon, 18 Mar 2024 17:06:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695023.1084546; Mon, 18 Mar 2024 17:06:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGRU-00043a-KX; Mon, 18 Mar 2024 17:06:32 +0000 Received: by outflank-mailman (input) for mailman id 695023; Mon, 18 Mar 2024 17:06:31 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHP-0002f9-QJ for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:07 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6948a70f-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:06 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4140edd58c9so10184745e9.2 for ; Mon, 18 Mar 2024 09:56:06 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:04 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6948a70f-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780965; x=1711385765; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=db9MIu6tq57fxX6+DJjHh0A6dPzIiHMhHEDPZhvZ7xg=; b=LkgZXuM1SpBKcsAvh9IeKLlWpMJPnrNprdW7qYCNgwMKo8nUC4cd+6vdRjVcu0p9Cu jvfxEoEfd3qSRWTOVXcqpMwj2Ft39yiPeQnpMGOrJCuiqyJUJESHF1jo7j6c2zM7TYHf JDlhpx7CFU1Y92RK7jjQ1RHHh5dooNzBLQfCw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780965; x=1711385765; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=db9MIu6tq57fxX6+DJjHh0A6dPzIiHMhHEDPZhvZ7xg=; b=ldhSvICYvvTYJjAyP1poUYQGyGw/LgYHpYIDMcJ/63xqubrmP2j4rKuX6Xh//Lwf/Z QjAa3Q87LcpRXFVo+nRglkRXpw8WY8XsRyw/QdBYmNEDCgGjQ39+f69YwNqLvIkIL3A0 i1RQcZl0iRzwafWjgJS6dfFzCoo4J6aL6ePxPxQQ7Tw09pt4Uk+Aq2oMOHj9spB26pCz p55djV9b1mDFtLWCJLacsm/hLeHSONCA3zqe8NVttIqTJQTrf2mZ3h+rdac7Tva2+IOG K+sZjX/6tvTyXZ6CjiezispXWiZyLs7ed80z0DGivRsH0XdT6J1A9ll/J+UiTlPoKM4r OOWA== X-Gm-Message-State: AOJu0Yz4CuPJrkBd51H6h3NJr4xoPRIAlnSoJRsZww4vsr1PxNkIcZGY jHLSneHQOuUSEtqIZknk+NMpz6SWc1EERTZgyuGK0q4J4z7d3ZU0bCujU6tc6xIroVvYK3EzEuN 4 X-Google-Smtp-Source: AGHT+IF8FyIuw7act4Lxdk6yYT/LfGC/uC/VONogW1shdNl6St4NFE1wpSNAwaKkYl2tlslm4JPc8g== X-Received: by 2002:a05:600c:3c8a:b0:414:d95:cc47 with SMTP id bg10-20020a05600c3c8a00b004140d95cc47mr51909wmb.30.1710780965756; Mon, 18 Mar 2024 09:56:05 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 17/36] target_editfile: Use the same user to retrieve and send Date: Mon, 18 Mar 2024 16:55:26 +0000 Message-Id: <20240318165545.3898-18-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 The file "/boot/grub/grub.cfg" on Debian Bookworm isn't accessible from the "osstest" user, but target_editfile_root() tries to grab the file as "osstest" then edit it as "root. Change teditfileex() to use the same $user also to get the file. This will fix ts-examine-serial-pre step. Signed-off-by: Anthony PERARD --- Osstest/TestSupport.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 0dded9b2..b86f1d96 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -783,7 +783,7 @@ sub teditfileex { logm("editing $rfile to $rdest as $lfile".'{,.new}'); } - target_getfile($ho, 60, $rfile, $lfile); + tgetfileex($user, $ho, 60, $rfile, $lfile); open '::EI', "$lfile" or die "$lfile: $!"; open '::EO', "> $lfile.new" or die "$lfile.new: $!"; From patchwork Mon Mar 18 16:55:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 838A9C54E58 for ; Mon, 18 Mar 2024 16:56:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694957.1084382 (Exim 4.92) (envelope-from ) id 1rmGHT-0006Zc-J5; Mon, 18 Mar 2024 16:56:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694957.1084382; Mon, 18 Mar 2024 16:56:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHS-0006V2-Lp; Mon, 18 Mar 2024 16:56:10 +0000 Received: by outflank-mailman (input) for mailman id 694957; Mon, 18 Mar 2024 16:56:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHP-0002gq-I9 for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:07 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 69b58789-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:07 +0100 (CET) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4141156f245so7506305e9.2 for ; Mon, 18 Mar 2024 09:56:07 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:06 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 69b58789-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780966; x=1711385766; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fxXSne1viGno6ujJqAzeYSDYVejkK2lsBexcKCTd9Jg=; b=iuOyy86mGh/1HfkVANZ+JsVV865jsEK8Z5V0gDlncrdnzvuRLG/AmPEA5/G4PQdjMe EnlfoSWP1Tb8foyBVEHyqHgCl8qHzqMhItXI+JyWdvoyv794w6fM4/Vvef5/dbgxuZiA ySs9My/qfwyBOvzZP90UguozVeJ6gplcqt31E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780966; x=1711385766; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fxXSne1viGno6ujJqAzeYSDYVejkK2lsBexcKCTd9Jg=; b=pKAJZ5dt+Ks7ifNOufWNZHDoLD2H9zG70jEhkX/GBjkYFxBWnFn8XQevAtDWnyZcvc lEI0BRoB6kBwJEK76kgUlYiK2M0v6xKh3o7bIbLBi+00GY3uu69sflCBq7VE7eufgqlV 2xFE/pE4oW2z8Hd1fY9s/xQVbx2syKJnTKQpJxjOmUzh3MWSK0kQVYpcJU0UQtloz5f7 8n6gEcqCsE9O4VoOjrnW0Jq7HKhlXrHIuMpGHadMtSN7aifClMQxoM/6XSasy5zb/s4q hF8Bh4KHn9IYbyjpjYsCBaLk+LYYxELD7tRkCdxVaaO2NR9c/SACBl0YrU3bF8Ma8vrq nOTw== X-Gm-Message-State: AOJu0YzjIa0aVIWEZmwBwblsbwi+tHWKW/HrQgsPlumP5fHsqHcu2EiW +hdCcVcmU+w7yRR5+sXHkleslMN9Z2RWbvUL6MMKV6zjV6Dz8Gud1T8T5NVHr/ZDC6KqXAEQf76 v X-Google-Smtp-Source: AGHT+IGts/Clq9c4Y13uCTSoDOBJYRSXE2aoOQ9n3WCapA8Q5lY/5I6/FU2eI66ePGPjgudOWqCimA== X-Received: by 2002:a05:600c:1912:b0:414:38d:81f with SMTP id j18-20020a05600c191200b00414038d081fmr6836636wmq.29.1710780966410; Mon, 18 Mar 2024 09:56:06 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 18/36] ts-xen-install: remove "libc6-xen" package installation Date: Mon, 18 Mar 2024 16:55:27 +0000 Message-Id: <20240318165545.3898-19-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 libc6-xen packaged have been removed from Debian Bookworm. Signed-off-by: Anthony PERARD --- ts-xen-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-xen-install b/ts-xen-install index bf55d4e5..3a913fce 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -64,7 +64,7 @@ sub packages () { if ($ho->{Suite} !~ m/lenny|squeeze/) { target_install_packages($ho, qw(libfdt1)); } - if ($ho->{Arch} eq 'i386') { + if ($ho->{Arch} eq 'i386' && $ho->{Suite} =~ m/wheezy|jessie|stretch|buster/) { target_install_packages($ho, qw(libc6-xen)); } target_install_packages($ho, @{toolstack($ho)->{ExtraPackages}}) From patchwork Mon Mar 18 16:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595650 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6C76C54E58 for ; Mon, 18 Mar 2024 17:10:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695053.1084589 (Exim 4.92) (envelope-from ) id 1rmGV8-0000M1-Rl; Mon, 18 Mar 2024 17:10:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695053.1084589; Mon, 18 Mar 2024 17:10:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGV8-0000Lu-Od; Mon, 18 Mar 2024 17:10:18 +0000 Received: by outflank-mailman (input) for mailman id 695053; Mon, 18 Mar 2024 17:10:17 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHR-0002f9-TW for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:10 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6a5c7cb5-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:08 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4146172fb7eso2495315e9.1 for ; Mon, 18 Mar 2024 09:56:08 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:06 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6a5c7cb5-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780967; x=1711385767; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CUXPAW3FLPo5B8zg0wxT5OYvS3EjbAdIkCVM/s4WpSc=; b=htBNCusyWccfWEdbMN4cXS3nrn8KySBg26OXxRrG3/2RBRtBhU5Zd9Kbeqt3r775OR l5xFnK7owEz6auWbaClv7Xwrq7Si1lYoVWsBGo3idXvh9YuAZYL4g8yhy2jG1GL120fa jKAQzvzw8YlCN0/n+UwVEKYWqD3c2JEIUoUlY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780967; x=1711385767; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CUXPAW3FLPo5B8zg0wxT5OYvS3EjbAdIkCVM/s4WpSc=; b=g0wfBbYmlCmuac8XqbKJMYm4z/cNHwGvA+wnr5rDUakKIErDhg6q1rMokz9BwqXR+0 baAE3qoMRRlx2a2lPEekuQFISBYQuSh6Mzd1X4FGJavdcnKG5fbVmqlmEGWPT1bVqgu1 wLhQJ7EARStSaYYBRRqZ37Sfj+ifw+JzwqqOzcU7BkcT+85+FsFir2sJqjz5+9zrpSc0 8NFICuWfTx5/hF/gF9vd0Ox7k5ceqPYYVpKUUGRuAY0+JBcOvEkV7hkstFYbHJXwsTCE TTy7cm6POZ3pifep6gyuSmR5/FSe1/FRcPKAZzWry2BI9DqW6x6HqWI1+4moaGm5f3Vi vXHg== X-Gm-Message-State: AOJu0YxHbQ9H/5C21WhflI84AyujH8ggOLJNLpVFGwm6DiiwR6E+GnMd f1q5fw8k96ElUo+y21IeKXWIi31QVDEvAAaBBemfL0+JooqS2wNjQa/T6vAYhYWjfjQKvAP0KSG c X-Google-Smtp-Source: AGHT+IEMMYPv3Ei8t1HgtSeYV5cqaFPoLK/jY5+n5K+v01i5UX0uQMizZO6JTdhDa0O1u48GL+n9kA== X-Received: by 2002:a05:600c:3b87:b0:413:2873:937 with SMTP id n7-20020a05600c3b8700b0041328730937mr5951899wms.35.1710780967257; Mon, 18 Mar 2024 09:56:07 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 19/36] overlay-bookworm: Import grub's 20_linux_xen from Debian Bookworm Date: Mon, 18 Mar 2024 16:55:28 +0000 Message-Id: <20240318165545.3898-20-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 This is a copy of the file installed, from grub-common package. We are going to edit it shortly. Signed-off-by: Anthony PERARD --- overlay-bookworm/etc/grub.d/20_linux_xen | 379 +++++++++++++++++++++++ 1 file changed, 379 insertions(+) create mode 100755 overlay-bookworm/etc/grub.d/20_linux_xen diff --git a/overlay-bookworm/etc/grub.d/20_linux_xen b/overlay-bookworm/etc/grub.d/20_linux_xen new file mode 100755 index 00000000..3a27fc6f --- /dev/null +++ b/overlay-bookworm/etc/grub.d/20_linux_xen @@ -0,0 +1,379 @@ +#! /bin/sh +set -e + +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix="/usr" +exec_prefix="/usr" +datarootdir="/usr/share" + +. "$pkgdatadir/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os --class xen" +SUPPORTED_INITS="sysvinit:/lib/sysvinit/init systemd:/lib/systemd/systemd upstart:/sbin/upstart" + +if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then + OS=GNU/Linux +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` + # We can't cope with devices loop-mounted from files here. + case ${GRUB_DEVICE} in + /dev/*) ;; + *) exit 0 ;; + esac + ;; +esac + +# Default to disabling partition uuid support to maintian compatibility with +# older kernels. +GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true} + +# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter +# and mounting btrfs requires user space scanning, so force UUID in this case. +if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \ + || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ + && [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \ + || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ + && ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \ + || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then + LINUX_ROOT_DEVICE=PARTUUID=${GRUB_DEVICE_PARTUUID} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT. +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then + GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}" +fi +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then + GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" +fi + +case x"$GRUB_FS" in + xbtrfs) + rootsubvol="`make_system_path_relative_to_its_root /`" + rootsubvol="${rootsubvol#/}" + if [ "x${rootsubvol}" != x ]; then + GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" + fi;; + xzfs) + rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` + bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" + LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}" + ;; +esac + +title_correction_code= + +linux_entry () +{ + linux_entry_xsm "$@" false + linux_entry_xsm "$@" true +} +linux_entry_xsm () +{ + os="$1" + version="$2" + xen_version="$3" + type="$4" + args="$5" + xen_args="$6" + xsm="$7" + # If user wants to enable XSM support, make sure there's + # corresponding policy file. + if ${xsm} ; then + xenpolicy="xenpolicy-$xen_version" + if test ! -e "${xen_dirname}/${xenpolicy}" ; then + return + fi + xen_args="$xen_args flask=enforcing" + xen_version="$(gettext_printf "%s (XSM enabled)" "$xen_version")" + # xen_version is used for messages only; actual file is xen_basename + fi + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + if [ x$type != xsimple ] ; then + if [ x$type = xrecovery ] ; then + title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + elif [ "${type#init-}" != "$type" ] ; then + title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "${type#init-}")" + else + title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" + fi + replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" + if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" + title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" + grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" + fi + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + else + title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" + echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi + if [ x$type != xrecovery ] ; then + save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" + fi + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" + lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$xmessage" | grub_quote)' + if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then + xen_rm_opts= + else + xen_rm_opts="no-real-mode edd=off" + fi + ${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + echo '$(echo "$lmessage" | grub_quote)' + ${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + # TRANSLATORS: ramdisk isn't identifier. Should be translated. + message="$(gettext_printf "Loading initial ramdisk ...")" + initrd_path= + for i in ${initrd}; do + initrd_path="${initrd_path} ${rel_dirname}/${i}" + done + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + ${module_loader} --nounzip $(echo $initrd_path) +EOF + fi + if ${xsm} && test -n "${xenpolicy}" ; then + message="$(gettext_printf "Loading XSM policy ...")" + sed "s/^/$submenu_indentation/" << EOF + echo '$(echo "$message" | grub_quote)' + ${module_loader} ${rel_dirname}/${xenpolicy} +EOF + fi + sed "s/^/$submenu_indentation/" << EOF +} +EOF +} + +linux_list= +for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do + if grub_file_is_not_garbage "$i"; then + basename=$(basename $i) + version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") + dirname=$(dirname $i) + config= + for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do + if test -e "${j}" ; then + config="${j}" + break + fi + done + if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then linux_list="$linux_list $i" ; fi + fi +done +if [ "x${linux_list}" = "x" ] ; then + exit 0 +fi + +file_is_not_xen_garbage () { + case "$1" in + */xen-syms-*) + return 1;; + */xenpolicy-*) + return 1;; + */*.config) + return 1;; + *) + return 0;; + esac +} + +xen_list= +for i in /boot/xen*; do + if grub_file_is_not_garbage "$i" && file_is_not_xen_garbage "$i" ; then xen_list="$xen_list $i" ; fi +done +prepare_boot_cache= +boot_device_id= + +title_correction_code= + +machine=`uname -m` + +case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; + mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; + arm*) GENKERNEL_ARCH="arm" ;; + *) GENKERNEL_ARCH="$machine" ;; +esac + +# Extra indentation to add to menu entries in a submenu. We're not in a submenu +# yet, so it's empty. In a submenu it will be equal to '\t' (one tab). +submenu_indentation="" + +is_top_level=true + +while [ "x${xen_list}" != "x" ] ; do + list="${linux_list}" + current_xen=`version_find_latest $xen_list` + xen_basename=`basename ${current_xen}` + xen_dirname=`dirname ${current_xen}` + rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` + xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"` + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + if [ "x$is_top_level" != xtrue ]; then + echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + fi + if ($grub_file --is-arm64-efi $current_xen); then + xen_loader="xen_hypervisor" + module_loader="xen_module" + else + if ($grub_file --is-x86-multiboot2 $current_xen); then + xen_loader="multiboot2" + module_loader="module2" + else + xen_loader="multiboot" + module_loader="module" + fi + fi + + initrd_early= + for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \ + ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do + if test -e "${xen_dirname}/${i}" ; then + initrd_early="${initrd_early} ${i}" + fi + done + + while [ "x$list" != "x" ] ; do + linux=`version_find_latest $list` + gettext_printf "Found linux image: %s\n" "$linux" >&2 + basename=`basename $linux` + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + + initrd_real= + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do + if test -e "${dirname}/${i}" ; then + initrd_real="$i" + break + fi + done + + initrd= + if test -n "${initrd_early}" || test -n "${initrd_real}"; then + initrd="${initrd_early} ${initrd_real}" + + initrd_display= + for i in ${initrd}; do + initrd_display="${initrd_display} ${dirname}/${i}" + done + gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 + fi + + if test -z "${initrd_real}"; then + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + if [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] \ + || [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ]; then + + linux_root_device_thisversion=${GRUB_DEVICE} + else + linux_root_device_thisversion=PARTUUID=${GRUB_DEVICE_PARTUUID} + fi + fi + + # The GRUB_DISABLE_SUBMENU option used to be different than others since it was + # mentioned in the documentation that has to be set to 'y' instead of 'true' to + # enable it. This caused a lot of confusion to users that set the option to 'y', + # 'yes' or 'true'. This was fixed but all of these values must be supported now. + if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then + GRUB_DISABLE_SUBMENU="true" + fi + + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then + linux_entry "${OS}" "${version}" "${xen_version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" + + submenu_indentation="$grub_tab$grub_tab" + + if [ -z "$boot_device_id" ]; then + boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" + fi + # TRANSLATORS: %s is replaced with an OS name + echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" + is_top_level=false + fi + + linux_entry "${OS}" "${version}" "${xen_version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" + for supported_init in ${SUPPORTED_INITS}; do + init_path="${supported_init#*:}" + if [ -x "${init_path}" ] && [ "$(readlink -f /sbin/init)" != "$(readlink -f "${init_path}")" ]; then + linux_entry "${OS}" "${version}" "${xen_version}" "init-${supported_init%%:*}" \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} init=${init_path}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" + + fi + done + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" "${xen_version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" + fi + + list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` + done + if [ x"$is_top_level" != xtrue ]; then + echo ' }' + fi + xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` +done + +# If at least one kernel was found, then we need to +# add a closing '}' for the submenu command. +if [ x"$is_top_level" != xtrue ]; then + echo '}' +fi + +echo "$title_correction_code" From patchwork Mon Mar 18 16:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F2CB6C54E6A for ; Mon, 18 Mar 2024 16:56:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694958.1084395 (Exim 4.92) (envelope-from ) id 1rmGHV-0007A9-TR; Mon, 18 Mar 2024 16:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694958.1084395; Mon, 18 Mar 2024 16:56:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHU-0006yW-SI; Mon, 18 Mar 2024 16:56:12 +0000 Received: by outflank-mailman (input) for mailman id 694958; Mon, 18 Mar 2024 16:56:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHR-0002gq-IH for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:09 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6ae69f0a-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:09 +0100 (CET) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4140efa16caso10029125e9.0 for ; Mon, 18 Mar 2024 09:56:09 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:07 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6ae69f0a-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780968; x=1711385768; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TRUCir5QMxWCvauYalwhk7w+cXPi5YqEzZUAMUwLH6w=; b=PFOKlsl5ujJpoCHaw2IyubF/EZij9PKYxQWAOqhaivVxxHApqLgD/KnhcCSXN9lMlx Xy1lnkdf1tPRGcT/DeLsBz3eVCoBdB0DINF9uFBp6PVd8m3TrbA3XHDRBxa5TtqETDA/ O/WX7Re7KtqkZZF9FZsLnhCpCr2cTnXVoJyMA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780968; x=1711385768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TRUCir5QMxWCvauYalwhk7w+cXPi5YqEzZUAMUwLH6w=; b=bDyi5ZuKlLVRK8ILSh4/99KeelSq8sl7FRNduiPCz75E7PBN2As+fwKTgtJIUzPRlp YV8qcGROPIkWO9hOgAIRSu3eFqdREvUqd1+BS86WGUrgC9X2819Y7TmlivTPu0LWSxF3 7W2JqPkA1F60reYiewUFqPnqp2pJ+CUnRadacVbvsTHH5pVHyipOFvmfB06CwSIoAOXn 2fMdufylo6c0ReOhIZCVcET8YNtvGNqswnP/RuGOra7/FsO7Gj35Wrj+QhutTQDt1jU7 VitPpT8mwuUXAZBI9wc3lhvdAfSbVZ4bL2w17iaq07slERFc5dkZO5xfWedms6hvH7b4 LkSg== X-Gm-Message-State: AOJu0YwjkVVX33TPC6UR1PSZ6FQ7BVwnkMMORS0ug1/q1p6WqIdzBx4r Xz5pO/5gM9cB7vqlyPn5W8tlo5hOpNNMajQnqvtaxKJVOoex3KyxJvGJimFfRK7s0vkNTPKLyMY 9 X-Google-Smtp-Source: AGHT+IHCSGbNmuTOds0JmXB22ZwHsY5nwpzZhWQQbalycU8NtZvJ6ckR8/JppxSj4dFAsDDGBkJgMg== X-Received: by 2002:a05:600c:314c:b0:414:1eb:287 with SMTP id h12-20020a05600c314c00b0041401eb0287mr7138883wmo.14.1710780968372; Mon, 18 Mar 2024 09:56:08 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 20/36] overlay-bookworm: 20_linux_xen: Fix XSM entries generation Date: Mon, 18 Mar 2024 16:55:29 +0000 Message-Id: <20240318165545.3898-21-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 It turns out that setting $xen_version in linux_entry_xsm() override $xen_version in the loop over $xen_list. This means that only one entry per Xen version is going to enable XSM, but all further entries are going to have "(XSM enabled)" in their titles without enabling XSM. When a "xenpolicy-$xen_version" file was found for the current $xen_version, it would be overwrite $xen_version to add "(XSM enabled)" to the menu entry title. Once change, the next call to linux_entry_xsm() would also have this modified $xen_version and would look for the file "xenpolicy-*(XSM enabled)" and fail. Signed-off-by: Anthony PERARD (upstream commit: https://git.savannah.gnu.org/cgit/grub.git/commit/?id=db1faedccdce3cf83336155a95c04a8db03744c5) --- overlay-bookworm/etc/grub.d/20_linux_xen | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/overlay-bookworm/etc/grub.d/20_linux_xen b/overlay-bookworm/etc/grub.d/20_linux_xen index 3a27fc6f..85593525 100755 --- a/overlay-bookworm/etc/grub.d/20_linux_xen +++ b/overlay-bookworm/etc/grub.d/20_linux_xen @@ -102,7 +102,7 @@ linux_entry_xsm () { os="$1" version="$2" - xen_version="$3" + entry_xen_version="$3" type="$4" args="$5" xen_args="$6" @@ -110,27 +110,27 @@ linux_entry_xsm () # If user wants to enable XSM support, make sure there's # corresponding policy file. if ${xsm} ; then - xenpolicy="xenpolicy-$xen_version" + xenpolicy="xenpolicy-$entry_xen_version" if test ! -e "${xen_dirname}/${xenpolicy}" ; then return fi xen_args="$xen_args flask=enforcing" - xen_version="$(gettext_printf "%s (XSM enabled)" "$xen_version")" - # xen_version is used for messages only; actual file is xen_basename + entry_xen_version="$(gettext_printf "%s (XSM enabled)" "$entry_xen_version")" + # entry_xen_version is used for messages only; actual file is xen_basename fi if [ -z "$boot_device_id" ]; then boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" fi if [ x$type != xsimple ] ; then if [ x$type = xrecovery ] ; then - title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" + title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${entry_xen_version}" "${version}" "$(gettext "${GRUB_RECOVERY_TITLE}")")" elif [ "${type#init-}" != "$type" ] ; then - title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${xen_version}" "${version}" "${type#init-}")" + title="$(gettext_printf "%s, with Xen %s and Linux %s (%s)" "${os}" "${entry_xen_version}" "${version}" "${type#init-}")" else - title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" + title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${entry_xen_version}" "${version}")" fi replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then + if [ x"Xen ${entry_xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" @@ -148,7 +148,7 @@ linux_entry_xsm () prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" + xmessage="$(gettext_printf "Loading Xen %s ..." ${entry_xen_version})" lmessage="$(gettext_printf "Loading Linux %s ..." ${version})" sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$xmessage" | grub_quote)' From patchwork Mon Mar 18 16:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A509C54E58 for ; Mon, 18 Mar 2024 16:56:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694960.1084411 (Exim 4.92) (envelope-from ) id 1rmGHZ-00089X-08; Mon, 18 Mar 2024 16:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694960.1084411; Mon, 18 Mar 2024 16:56:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHY-000818-4H; Mon, 18 Mar 2024 16:56:16 +0000 Received: by outflank-mailman (input) for mailman id 694960; Mon, 18 Mar 2024 16:56:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHU-0002gq-KK for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:12 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6b5cee19-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:09 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-4140fcf4d02so9699765e9.2 for ; Mon, 18 Mar 2024 09:56:09 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:08 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6b5cee19-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780969; x=1711385769; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x31hu31lN3/8MBLeRtOzuN/pstr4iAsaXj67oA29mMM=; b=QDF9rrS+Q0GRBzA0qB4B0FSE4WeWxLtTj0MBCJnB5qYDrLZUlzY9JzM65zelP9rx2A FFs5pDNLJDMb94agL2MVK9hSwlDkk71JBfmJ4CnxlJKBGDji62xnrlT3DtwAEadCgD3D Tk+/CKrLjZ6PROWw0k/29TT1i9hfG7E3HbP/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780969; x=1711385769; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x31hu31lN3/8MBLeRtOzuN/pstr4iAsaXj67oA29mMM=; b=uBODwpH66FtDbp5/SVmdfbWE13da51DKK6FcjBBsu14O9Ct2G3UXGvelewGKutKGXb WqK5FIIeVB5Ef+VId0rSXq77J3uU5cMlHy7Esey4uj/Ye6/3u9kMsGiVnSwHZJ96/zIe 4Lr9jihRPrEAsdWD8nJoXl4BPyY7g2bi6sNRgv1S+SnWoviuAItAXDhF52y6qIS8r9pB RTOtF9DGbl/tG6cmzfI9c4L1aJvolKbT0L9Nkb/YxcUNSZqUWyy27n4cvf6dECzh9RdM 6pTz0mkHCfMKYZqp4RETtZqIUOHheamUnk0HgyKaj0c6Kwow8PJm1sM+xClKi4jz5LGO 3egg== X-Gm-Message-State: AOJu0YxDwtaM5u3nku6VILtUxz9OE/ewAjcuRsjk9zknIHrfMU3ZGblq UMC9AyztQsuq0AU6GmghL5JtO5SHt58+iPlArMDFmifK8XG0mCr1rS2KoonZBrOJRM3UvqJkrOd j X-Google-Smtp-Source: AGHT+IFb+ZRklxoef/nwlHBK96uZAbyl0zIIXrk9peG9eD6AT/xjIMfOYyOunlmza/YB/lsbTucYTw== X-Received: by 2002:a05:600c:4f92:b0:414:101a:fa67 with SMTP id n18-20020a05600c4f9200b00414101afa67mr20261wmq.18.1710780969153; Mon, 18 Mar 2024 09:56:09 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 21/36] ts-xtf-install: Install python symlink Date: Mon, 18 Mar 2024 16:55:30 +0000 Message-Id: <20240318165545.3898-22-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 ts-xtf-run does run ./xtf-runner, which run `python` in its shebang. So install a `python` symlink to `python3`. Signed-off-by: Anthony PERARD --- ts-xtf-install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ts-xtf-install b/ts-xtf-install index a64fd329..fea737ff 100755 --- a/ts-xtf-install +++ b/ts-xtf-install @@ -28,6 +28,11 @@ $whhost ||= 'host'; our $ho= selecthost($whhost); +sub packages () { + if ($ho->{Suite} !~ m/wheezy|jessie|stretch|buster/) { + target_install_packages($ho, qw(python-is-python3)); + } +} sub extract () { my %distpath; @@ -35,4 +40,5 @@ sub extract () { $r{xtfbuildjob}, \%distpath); } +packages(); extract(); From patchwork Mon Mar 18 16:55:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595630 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E80D1C54E58 for ; Mon, 18 Mar 2024 16:59:58 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694968.1084443 (Exim 4.92) (envelope-from ) id 1rmGKz-0005MR-OE; Mon, 18 Mar 2024 16:59:49 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694968.1084443; Mon, 18 Mar 2024 16:59:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGKz-0005MK-LV; Mon, 18 Mar 2024 16:59:49 +0000 Received: by outflank-mailman (input) for mailman id 694968; Mon, 18 Mar 2024 16:59:48 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHT-0002f9-RY for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:11 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6bbc4195-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:10 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41412e6b2cfso6573085e9.2 for ; Mon, 18 Mar 2024 09:56:10 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:09 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6bbc4195-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780970; x=1711385770; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8vSVbaeX7MmaJBk10Hu8Qu/+WIlUUHoLJc0mR6P7msQ=; b=TyowofsPCCvt9Ocm+DukG/HMyZBju+IsUIwbNj1JHo+hXq54y3oUDUJ4N5sAcQdiZb Fus+Ct6cRW7kip7g/cMr1Q7GZ1vndbc/njqMXzLcGiEDjfeECue1jtZP9bCDHEU26+q/ x4YVsw5vs3XK6V/EGS8BSVr6XTHzoR+i/O+L4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780970; x=1711385770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8vSVbaeX7MmaJBk10Hu8Qu/+WIlUUHoLJc0mR6P7msQ=; b=q2IJD/IKOifQNjaWd6/neWcGTmhyL6hN5Au8Lrep0oNhcbtU2xYnIOA1VEp+zCoqjx LcSaPin7sAMnrOCKDj23P2sZvDaTfav0GPVqNXZyB9ezuUNAopnldDJZ8cG22fuctw6s qBOFCxizdepKj2S2Ny7W/xpNhx7I5bgwXp1/02vb1YR5nLDDQFlku1f8tNFmio///hOP 6jz/w7KytQ1vlkydinnvmuHapcLcsinfhycs1bcrA4HpZS76Gkagq47ihcTY8XQHEyMZ 0k0uSmPSYJ76E6qy+u1ZPJ0W4LrdUxD54KFI57W+8F20x5xRM94gZvXPFd+N0/kecfGs F1GQ== X-Gm-Message-State: AOJu0YxRSRcDVUj3EsDaak5IJ2GZt+4z/VXAP6ZQC/ata+LtwQSMkMBB FZfyQtpC5o3k9/fuNWqpqQQPcR8DbmwNChphTwM2tbNpSFkpK8xWM6XR9o2/nCC0kG3PQOVq57C N X-Google-Smtp-Source: AGHT+IHc6tEK6LHXMJQd7rlrLaf6dRX6GOnl9+9ew3zNLSZmb0XPcsMiFQNxTzFeNsTNHVFZ9f5mRw== X-Received: by 2002:a05:600c:3549:b0:414:523f:90d2 with SMTP id i9-20020a05600c354900b00414523f90d2mr1042549wmq.34.1710780969870; Mon, 18 Mar 2024 09:56:09 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 22/36] setupboot_grub2: Parse arm64 uefi grub verbes Date: Mon, 18 Mar 2024 16:55:31 +0000 Message-Id: <20240318165545.3898-23-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 20_linux_xen now uses "xen_hypervisor" and "xen_module" in place of "multiboot2?" and "module2?" when generating a config file for arm64-uefi. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 57f31977..4f07cdef 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -541,7 +541,7 @@ sub setupboot_grub2 ($$$$) { $entry->{Hv}= $1; $entry->{Chainload} = 1; } - if (m/^\s*multiboot2?\s+(?:\/boot)?\/(xen\-[0-9][-+.0-9a-z]*\S+)\s+(.*)/) { + if (m/^\s*(?:multiboot2?|xen_hypervisor)\s+(?:\/boot)?\/(xen\-[0-9][-+.0-9a-z]*\S+)\s+(.*)/) { die unless $entry; $entry->{Hv}= $1; $entry->{Chainload} = 0; @@ -553,16 +553,16 @@ sub setupboot_grub2 ($$$$) { $entry->{KernVer}= $2; $entry->{KernOpts}= $3; } - if (m/^\s*module2?\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) { + if (m/^\s*(?:module2?|xen_module)\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) { die unless $entry; $entry->{KernDom0}= $1; $entry->{KernVer}= $2; $entry->{KernOpts}= $3; } - if (m/^\s*module2?\s+(?:--nounzip\s+)*(?:\/boot)?\/(initrd\S+)/) { + if (m/^\s*(?:module2?|xen_module)\s+(?:--nounzip\s+)*(?:\/boot)?\/(initrd\S+)/) { $entry->{Initrd}= $1; } - if (m/^\s*module2?\s*\/(xenpolicy\S+)/) { + if (m/^\s*(?:module2?|xen_module)\s*\/(xenpolicy\S+)/) { $entry->{Xenpolicy}= $1; } } From patchwork Mon Mar 18 16:55:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595654 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3CC7C54E5D for ; Mon, 18 Mar 2024 17:11:38 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695073.1084629 (Exim 4.92) (envelope-from ) id 1rmGWK-0002v5-TX; Mon, 18 Mar 2024 17:11:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695073.1084629; Mon, 18 Mar 2024 17:11:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGWK-0002uy-Qa; Mon, 18 Mar 2024 17:11:32 +0000 Received: by outflank-mailman (input) for mailman id 695073; Mon, 18 Mar 2024 17:11:31 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHV-0002gq-Ka for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:13 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6c40284e-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:11 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41411421113so7765955e9.1 for ; Mon, 18 Mar 2024 09:56:11 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:10 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6c40284e-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780970; x=1711385770; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a1FmchBsn53IniDlrcuaP8DsX+RYkOrmvm7uzgbbq7I=; b=GCIDuRpdPlNgeAGAnH0+/8OzTcPZufOurq4jpflyQ45brtbpbvt3QM6dExvcltJE45 ZMEUZxYsaTTvLA+4WVQ1WmWMn5cQ3DcRPLOv59loa8u4Q7AQxBoDPlyaL+HC/CxosnWO eaI5J1Rut1cONFewmRLPZ5TfMduTSZcO5xuBo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780970; x=1711385770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a1FmchBsn53IniDlrcuaP8DsX+RYkOrmvm7uzgbbq7I=; b=cl8FTVMZLI57AmhAkW0JHYMTYGfX2h7IloMVV50rrKZlLwhRbqKkd5+ThNQVVuEn7F EHmZomkCamrZ/MRfHAFK4daxhGASJYObQqCWbkgT71o8qVsMKMdxBJS6xTpxygykwG4R ONOVdmSWx8+fPDP2bFUel+46AJB4O3iMlXhXuHqbR2d4RDRRG89cayJ5q+Yhke8XHIM+ A23VdXTws3plnXxx0O9t1eaKNjFYcA11SpQZo24JlYilKPW0/SQ+rXwtvK96c9k/4E4d T6NhJKilIfwzO3qi88Fq/SJxAN4i/4zszxiB4NUC0HUa6z92TNeRASPLItKG0+qf3pnQ wxzA== X-Gm-Message-State: AOJu0YzeS6Ygj5q5uuDV9dVve1j2QWfZQziC5sn8d+KzKUfJ69JiijyD eDIxoyHVUWEzWwcZbo08vEsGxAHhki6TrA93Y3R7pIvgdyDUMvhhUCmNbJgLkE6DppxY6tcasG7 k X-Google-Smtp-Source: AGHT+IHUWsml3D4ikWb31YIkSLv/z6wgQgGRvJNqTp7bVNw7TXv3i6SHWlKhpDk7+qlnPGxvigH7tw== X-Received: by 2002:a05:600c:1554:b0:414:39c:d9f0 with SMTP id f20-20020a05600c155400b00414039cd9f0mr27157wmg.2.1710780970663; Mon, 18 Mar 2024 09:56:10 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 23/36] bookworm: Extend ARM clock workaround Date: Mon, 18 Mar 2024 16:55:32 +0000 Message-Id: <20240318165545.3898-24-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Still broken on arndale, serial stop working early, then the machine timeout when working on creating a xen guest with xen-create-guest. Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 4f07cdef..68f1be60 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -253,8 +253,10 @@ END my @xenkopt = @kopt; push @xenkopt, $xenkopt; # https://bugs.xenproject.org/xen/bug/45 + # #45 - arm: domain 0 disables clocks which are in fact being used + # https://lore.kernel.org/xen-devel/1414672390.2064.31.camel@citrix.com/ push @xenkopt, "clk_ignore_unused" - if $ho->{Suite} =~ m/wheezy|jessie|stretch|buster/; + if $ho->{Suite} =~ m/wheezy|jessie|stretch|buster|bookworm/; $xenkopt = join ' ', @xenkopt; logm("Dom0 Linux options: $xenkopt"); From patchwork Mon Mar 18 16:55:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 920B2C54E58 for ; Mon, 18 Mar 2024 17:11:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695063.1084620 (Exim 4.92) (envelope-from ) id 1rmGVx-0001yW-Lw; Mon, 18 Mar 2024 17:11:09 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695063.1084620; Mon, 18 Mar 2024 17:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGVx-0001yL-Hk; Mon, 18 Mar 2024 17:11:09 +0000 Received: by outflank-mailman (input) for mailman id 695063; Mon, 18 Mar 2024 17:11:08 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHY-0002gq-L9 for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:16 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6ca5a649-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:12 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-41412253e71so7269575e9.0 for ; Mon, 18 Mar 2024 09:56:11 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:11 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6ca5a649-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780971; x=1711385771; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NJaVDu1HMN8nfSe34Wd7KEfeD3d4HQ65vleYBfsnpac=; b=LMlaEySiRkJ4mjwpdzbRgXK6nMiASO/g0d+vCYRUluLIzGfESf+D5kA6aRwwrcZiVh cAvn2Zw7kJrtdqw500dJ51tNrdDd3OYnUgr6brkmKpNnt1QtgrpjO4xW00ZR//1Q8uEi xfTax9o+3l1NQ4MvifyU/ClSnyWD02tR+lWxw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780971; x=1711385771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NJaVDu1HMN8nfSe34Wd7KEfeD3d4HQ65vleYBfsnpac=; b=FqgLC2R5M+qKumWVHQk96O/CJyAABDpF+7zxnVBv/9B/h/p4RkOd2ZAQu5MIbs19Xg F0g5slqWKgxe0mrOdKbcKiJ4rrASM/oqW8rRTyLqQBeGPg8sJdRQOJch4828G+rCPpYV 4iqwyqBcRa0mEWsXGdVv9lZsfsz2BnWhMTT7mMS8GNla/vlqHZziDbm+kbcAQiWam7Wy bAw4NIGJEW8RMJTQuc+NPZ7cufQBtZALdMsw8P4sFEKpvWq3td2JnZoq43ak/Pm0QWqu pnIssaqyvzOSxxrx+GMRWCYPE8DagdaZsls7xepsKKcEvkkzdfcWxKIUxtnr7Xn+OFSs ahaw== X-Gm-Message-State: AOJu0Yy6nLMID62VmgOsw+FpDqCsFNuPXag3HFtm+ywOcE0uQeGfMWIC JzYiXFnE1ilGZ4uJnSO0qcxbwkH0tcObVF6DwI2ovlQtNinWvvS9ISE+SD14Nxnrj73r/ZCFCMu W X-Google-Smtp-Source: AGHT+IHaB/e3DTU/QGOuC0o0JPNOW3lrzTIeuYBU2yenLyQlwGyoquKV7itLuHb60AIA57Y7D3FACA== X-Received: by 2002:a05:600c:1389:b0:413:ee4b:cd8e with SMTP id u9-20020a05600c138900b00413ee4bcd8emr9755387wmf.24.1710780971394; Mon, 18 Mar 2024 09:56:11 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 24/36] ts-nested-setup, setup l1 lvm volume groupe in guest Date: Mon, 18 Mar 2024 16:55:33 +0000 Message-Id: <20240318165545.3898-25-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 LVM in l0 doesn't let us run pvcreate on the host LV, `pvcreate $outer_lvdev` fails with: Cannot use /dev/$l0-vg/l1_gueststorage_outer_lv: device is an LV Signed-off-by: Anthony PERARD --- ts-nested-setup | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ts-nested-setup b/ts-nested-setup index be3d3733..7fc8beef 100755 --- a/ts-nested-setup +++ b/ts-nested-setup @@ -80,14 +80,14 @@ sub guest_storage () { target_cmd_root($l0, "vgremove -f $inner_vg ||:"); my $outer_lvdev = lv_create($l0, $outer_vg, $outer_lv, $size); - target_cmd_root($l0, <block_attach($l1, "$outer_lvdev,raw,sdb,rw"); # NB this does not update the l1 guest config so if the l1 is shut # down and recreated in the l0, this will vanish. + + target_cmd_root($l1, < X-Patchwork-Id: 13595638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99240C54E5D for ; Mon, 18 Mar 2024 17:06:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695022.1084536 (Exim 4.92) (envelope-from ) id 1rmGRT-0003oz-CI; Mon, 18 Mar 2024 17:06:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695022.1084536; Mon, 18 Mar 2024 17:06:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGRT-0003og-8a; Mon, 18 Mar 2024 17:06:31 +0000 Received: by outflank-mailman (input) for mailman id 695022; Mon, 18 Mar 2024 17:06:29 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHW-0002f9-AT for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:14 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6d2c6923-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:12 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-412e784060cso33043785e9.1 for ; Mon, 18 Mar 2024 09:56:12 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:11 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6d2c6923-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780972; x=1711385772; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SBbVHKd33XiAFp8InfzQ2O67LvEG3SShn6jQ9u4dc00=; b=UbQXMy8T5/lG3/oJsZOCFhiRcKMWiuB+InpZZSD8TRPiBLAHDAvcZ+yASgz1V9aYhc O0asParQiz/bXyoqt9uSu09ZYFGSANlK6tvmaFA7eu/4piXMaPc7oAu/UCEjydpPfW4O VvFDMlxPUQNzQoGFHynQ8CNpVK7425XNq0/6E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780972; x=1711385772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SBbVHKd33XiAFp8InfzQ2O67LvEG3SShn6jQ9u4dc00=; b=TUzlozZ8VwmITNw5bu8tXCwG28YaOKpzvnZaq72L5AduQ2nVRwUX4uRnzqap0rKKDo sqtByOFQKRht8pd+C6vvOYMypEos5kobOoUBvRC+5zRn4Mk8gxx1u2nxsHj8YYpzw9pQ hBZFufdHMF9zHZhRlzLtTkq6MPuZpth8q+ycfGKr1Yz0al34kGWQRsCV9A8TRPT311Eh VPwtixhgEB8KcYCgq4t5HBmq+om/10MvKoP+7FlMqi9tpGdw03VnOYXuoBS6C4Tjfx+F DBtXVJSPz/12K6Jqsk4gdiv87xRiPzsEqIBVGuZnjy8WGg9G7HRh4mcH5thzeahhCUUi sEPw== X-Gm-Message-State: AOJu0YydNKSkCxG0JiY77pS47/uep1bm+f/u09blQ9pshPCe1JQZGuWU XV13EDYRths3B0hLbQBzXxmCbTRivwIMRGvQ+1JhxWDoF3gxGP2/7/LIqS3WJDfVXF1nZeBE/om B X-Google-Smtp-Source: AGHT+IFfh0fP08THlnhUSXWi3DRrqb/p6ND/O7OrjUcLuB0OwKT4+l4NGeM7Wx5+NVd/NrB1sz7YKw== X-Received: by 2002:a05:600c:510a:b0:413:f3b2:d807 with SMTP id o10-20020a05600c510a00b00413f3b2d807mr183309wms.3.1710780972262; Mon, 18 Mar 2024 09:56:12 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 25/36] ts-leak-check: add new name for udevd workers Date: Mon, 18 Mar 2024 16:55:34 +0000 Message-Id: <20240318165545.3898-26-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 udevd on Bookworm shows as "(udev-worker)" in the process list. Suppress them. Signed-off-by: Anthony PERARD --- ts-leak-check | 1 + 1 file changed, 1 insertion(+) diff --git a/ts-leak-check b/ts-leak-check index f3cca8aa..023a945f 100755 --- a/ts-leak-check +++ b/ts-leak-check @@ -203,6 +203,7 @@ xenstore /libxl process .* udevd process .* .*/systemd-udevd +process .* \(udev-worker\) process .* /.+/systemd-shim file /var/run/xenstored/db From patchwork Mon Mar 18 16:55:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595633 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C954C54E58 for ; Mon, 18 Mar 2024 17:05:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695006.1084493 (Exim 4.92) (envelope-from ) id 1rmGQG-0001A2-EJ; Mon, 18 Mar 2024 17:05:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695006.1084493; Mon, 18 Mar 2024 17:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGQG-00019p-A0; Mon, 18 Mar 2024 17:05:16 +0000 Received: by outflank-mailman (input) for mailman id 695006; Mon, 18 Mar 2024 17:05:14 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHa-0002gq-LR for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:18 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6da5e26c-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:13 +0100 (CET) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4146172fb7eso2496295e9.1 for ; Mon, 18 Mar 2024 09:56:13 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:12 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6da5e26c-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780973; x=1711385773; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WY92DPy9yyYuIttEfcRR/uDeQT6by35Csv+FqYw2GjU=; b=eArn6NbJmpAczZpML3zC1abdGqvh97TlQy7hvXiTRprI2FI1TLWSrn3MSaEI8xtt1Y aG3tabmiO56vZaSZHgqnYHwHWnbDutJVgtWf5DCuYYonPsASczOw+Q3PQiKrGuvN5U9z zJA4mCCTpFqi2oZl+mVJodVo4W4yg4daG/lAM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780973; x=1711385773; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WY92DPy9yyYuIttEfcRR/uDeQT6by35Csv+FqYw2GjU=; b=v+/z1zd6VsuuqHej1LXAwJ0ndfMqEN1yoFrf08SflUHt1FipEtZh5V6INnwhiEgnCa ToI4INZpTIlu9zsSyKlEaIJzGxxKaTjzfxT1pwKvshRYl8zBnqhwrxrdRtfZLHJOl+pJ S0Zt3rHz9qeQZssAJ2aHAB8LrVhbWH/6LrV4ftD6hQmPBkfLKH6dbTfh5J314KhrVpry UKpXZ8g4qWSskhoXHGsakY4YnrI/2gXfpN0RUo7+PiqZL+h29TF22uOHWuu7/Nr90shg IZYBXu/o0xR4K1IR/uia4iRgPEqgWqMZGKgs5nm2ORlc5oFpiv2Tt8p7ujOVqXuR9IME 1etA== X-Gm-Message-State: AOJu0YykAogdyXL33AYA8ZqnPL23vpvyjOnUy/4Ap58Ns5h3yITgk1k+ YAetDG2PB06+7YBx37/vqBc1KZUGLfCtvk8Fo51Q+qkQJk7zkaYi2eX8D5GZq6nq9PTjKbVYicH y X-Google-Smtp-Source: AGHT+IF1ebGGtocd78nErOHJCPWrOnYGjl/ISK3xVKDFteWa2f2at20onqeMu1D6Z9cpnv3faxcFdA== X-Received: by 2002:a05:600c:19cd:b0:413:1688:2679 with SMTP id u13-20020a05600c19cd00b0041316882679mr7682967wmq.41.1710780972885; Mon, 18 Mar 2024 09:56:12 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 26/36] ts-debian-hvm-install: Allow udev failure in install media Date: Mon, 18 Mar 2024 16:55:35 +0000 Message-Id: <20240318165545.3898-27-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Kernel in "debian-12.1.0-amd64-netinst.iso" prevent debian installer from booting. Early on, it does `udevadm trigger --action=add`, which fails, the same way as the following runes fails: $ cat /sys/devices/virtual/input/input2/name Xen Virtual Keyboard $ echo add > /sys/devices/virtual/input/input2/uevent [ 25.884403] synth uevent: /devices/virtual/input/input2: failed to send uevent [ 25.916498] input input2: uevent: failed to send synthetic uevent: -12 sh: write error: Cannot allocate memory $ uname -a Linux (none) 6.1.0-10-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.38-1 (2023-07-14) x86_64 GNU/Linux This doesn't looks like a new issue, Debian Buster ISO seems to do the same thing (early boot command, and error in Linux logs), so it's probable that now `udevadm trigger --action=add` return an error when there's a failure. Bug report in the kernel and in Debian: https://bugzilla.kernel.org/show_bug.cgi?id=207695 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983357 One way to workaround the issue is to remove the vkb device, with xl's "vkb_device=0", but libvirt doesn't have support for this config option. The second option is to edit the installation media, and allow the failure. Once installed, the guest boot fine. Signed-off-by: Anthony PERARD --- Notes: There's a potential fix for the kernel: https://lore.kernel.org/xen-devel/20221209142615.33574-1-jandryuk@gmail.com/ ts-debian-hvm-install | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 4deb443e..44eb3ab1 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -174,13 +174,14 @@ sub isolinux_cfg () { END } -sub prepare_initrd ($$$) { - my ($initrddir,$newiso,$preseed_file_path) = @_; +sub prepare_initrd ($$$$) { + my ($initrddir,$newiso,$preseed_file_path,$extra_rune) = @_; return <<"END"; rm -rf $initrddir mkdir $initrddir cd $initrddir gzip -d < $newiso$ramdisk | cpio --extract --make-directories --no-absolute-filename + $extra_rune cp $preseed_file_path preseed.cfg find . | cpio -H newc --create | gzip -9 > $newiso$ramdisk cd - @@ -268,7 +269,17 @@ sub prep () { target_putfilecontents_root_stash($ho, 10, preseed(), $preseed_file_path); - $cmds = prepare_initrd($initrddir,$newiso,$preseed_file_path); + my $extra_preseed_rune = ''; + if ($gsuite =~ m/bookworm/) { + # Xen Virtual Keyboard initialisation fails and return ENOMEM + # https://bugzilla.kernel.org/show_bug.cgi?id=207695 + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983357 + $extra_preseed_rune .= < X-Patchwork-Id: 13595647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89CAFC54E5D for ; Mon, 18 Mar 2024 17:08:26 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695033.1084556 (Exim 4.92) (envelope-from ) id 1rmGT9-0005P9-0g; Mon, 18 Mar 2024 17:08:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695033.1084556; Mon, 18 Mar 2024 17:08:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGT8-0005P2-UK; Mon, 18 Mar 2024 17:08:14 +0000 Received: by outflank-mailman (input) for mailman id 695033; Mon, 18 Mar 2024 17:08:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHY-0002f9-50 for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:16 +0000 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [2a00:1450:4864:20::32d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6e3d44a0-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:14 +0100 (CET) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-4140efa16caso10029935e9.0 for ; Mon, 18 Mar 2024 09:56:14 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:13 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6e3d44a0-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780974; x=1711385774; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HtBRI5q1ugGBdzMJ59lHIWI9JzPcvWqKCvzTLY9svUQ=; b=EE+xHZOAJhdSIh8NINBrfOwg2ccsxY8pxncDazLPiZQUpqUgPck3OEFXN3fjzxR5pi KUXJCy+hfpp1QqkF9ERwK+QQsvkQFZCPLPEcHqOn6x03epFLM4tS7gU3wrT+GjBBKJJ5 +Ne+SGfWQRNinS/0TKKsSPXKtQSO9Y91zFwc8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780974; x=1711385774; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HtBRI5q1ugGBdzMJ59lHIWI9JzPcvWqKCvzTLY9svUQ=; b=WhDW3fxUIz4b7ymsCgVZkMLCCmzcdyzogZnLbPRqOuQRkgM/AdORPm3j2OpFU1RWpw rixjwt8E8y8L8zLsOGriJDoKqby/tRI3x9XIQ8qNcuAsnVinx2yXEjoVrrGpGbi+eicf y42D62jzZHWimSAnQHjOvXjMrKC7mfB1dmLcbpDP6lITLMo7TdiZB6b9sMOO+YEWkysB sYjD/y+scFR7TbqmiP4bOQFFwH5BGieHMh4Wg/95CBYJVLE8OTiMelwLraGkBA2qM8Kr JSwC16Sfla1nPT7uu+d1ju08doeHRrNTgPrIeFjsiQgqlEm5IZmU7AynFuD2jk24rjz3 oRrg== X-Gm-Message-State: AOJu0Ywj2Tb9c73QObJiVscowmKcJrkh4F0vH/gVWxkR8o+ZPKHPK7Lx czS2RyQfx6LZ0W6La7FmPNcMepQAwdsUPLN+SNK90KP/XEENIL0Ooms09w3ygOEo4OvCrz2cz4y d X-Google-Smtp-Source: AGHT+IFYpwoT1G6V0oSTOM12VU2g8triWdGvu3YXT2EEYJ3eTddOLxI3qxKpKBcLlryHUBMfFt9Z5A== X-Received: by 2002:a05:600c:a02:b0:414:8d7:8292 with SMTP id z2-20020a05600c0a0200b0041408d78292mr5089597wmp.0.1710780973942; Mon, 18 Mar 2024 09:56:13 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 27/36] ts-debian-fixup: Fix nic names for bookworm Date: Mon, 18 Mar 2024 16:55:36 +0000 Message-Id: <20240318165545.3898-28-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 `xen-create-image` doesn't create image for bookworm with a working network, we need to fix the interface name. For reference, there's a bug report upstream: "UnPredictableNetworkInterfaceNames 'fun' with Bookworm domU: eth0 -> enX0" https://github.com/xen-tools/xen-tools/issues/65 Signed-off-by: Anthony PERARD --- ts-debian-fixup | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ts-debian-fixup b/ts-debian-fixup index 810b3aba..4cf5f980 100755 --- a/ts-debian-fixup +++ b/ts-debian-fixup @@ -142,6 +142,20 @@ sub filesystems () { END } +sub fix_networking () { + return if debian_guest_suite($gho) !~ m/bookworm/; + + # `xen-create-image` doesn't setup network in a way that work with bookworm. + # The guest boots with "enX0" interface name, but it only try to setup "eth0". + # https://github.com/xen-tools/xen-tools/issues/65 + target_editfile_root($ho, $mountpoint."/etc/network/interfaces", sub { + while (<::EI>) { + s/\beth0\b/enX0/g; + print ::EO or die $!; + } + }); +} + sub unmount () { guest_umount_lv($ho, $gho); } @@ -243,6 +257,7 @@ target_cmd_root($ho, debian_dhcp_rofs_fix($ho, $mountpoint)); console(); randomseed(); filesystems(); +fix_networking(); otherfixupcfg(); writecfg(); unmount(); From patchwork Mon Mar 18 16:55:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595635 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17C92C54E6A for ; Mon, 18 Mar 2024 17:05:24 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695005.1084486 (Exim 4.92) (envelope-from ) id 1rmGQG-00016d-4L; Mon, 18 Mar 2024 17:05:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695005.1084486; Mon, 18 Mar 2024 17:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGQG-00016W-1j; Mon, 18 Mar 2024 17:05:16 +0000 Received: by outflank-mailman (input) for mailman id 695005; Mon, 18 Mar 2024 17:05:14 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHa-0002f9-VQ for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:18 +0000 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [2a00:1450:4864:20::132]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6eb2dc19-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:15 +0100 (CET) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-513a08f2263so4760043e87.3 for ; Mon, 18 Mar 2024 09:56:15 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:14 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6eb2dc19-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780975; x=1711385775; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xtK09ACQG18hKcj/CfOcQc0RzN2X4xDIkDXd97Aycqs=; b=Gk5sAZEaw880wIbY1Kj2tJpWzvQyyeKnGx1Y25Z0CmbLApnFztF6T/Jrq2Mrt6PmOD cVAbFM+TSffyU/zBwSBli5MVGpIT1b2Hp1jcacshWUIko2HSg84V69GBdGCJYbplA5XT d5Dqxi4KB2nDEcPl7P8vgozQP9ZE5OVaksvd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780975; x=1711385775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xtK09ACQG18hKcj/CfOcQc0RzN2X4xDIkDXd97Aycqs=; b=W8E+gvaba7QSeU2wnvDelFWW1ID4fx9jig3oCGjWgk3fQKyiSPbaOXs+f4Y+BoDkxP Tkh/7zROOQpqWNpL103JDLr/0T354ybDVSzX7Lww4V/iYTEbH59Adoz42JqbvtIliPAe mGVltRXqa3fQNXddNfg7iBy/Yv9UmXIdfJEcX9KSb/eFM+MGjmpV68q3ivfWH1pQa76t 6fqjdxKcC0VUC6v0cHyVKEhdmOkuzi2kvZXuRQQiS7eDxOXmuJdayq7Pb+WjmhkwQrj8 a2WvoEoKCUFP0XqW5tZsmfrLrtaXObQBiUqHkW1wtT2sRFMex61lBIQWVBREKqzh9rpz N3Pw== X-Gm-Message-State: AOJu0YyG1EQLMp3H7xrAi8nn4QZhN9jWxdzQ5wPHydHZRtQM+rT94hev XtJ+ghJXtgoXEl5iSBmvi9saQNtm6gh8YSjROYhdnRFZOULkIWrTSEr/Bm79c4qxD3ZYlEBcFw5 f X-Google-Smtp-Source: AGHT+IHtV0W8DH+rETOlSbQbdh4ZKnXrJUKP2bDBbqlzw7bkDvsdXXsor8rNtP7qUqEKb7G7NdbOXw== X-Received: by 2002:ac2:442e:0:b0:513:db34:7caf with SMTP id w14-20020ac2442e000000b00513db347cafmr61195lfl.17.1710780974782; Mon, 18 Mar 2024 09:56:14 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 28/36] ts-debian-install: keep avoiding to use pygrub Date: Mon, 18 Mar 2024 16:55:37 +0000 Message-Id: <20240318165545.3898-29-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 xen-tools commit 83c37b476a75 ("Start all Debian releases since Stretch (9) with pygrub by default") started to use pygrub by default. Revert this. With "pygrub" setting, xen-create-guest fails on armhf, the 80-install-kernel hook fails because it doesn't know about "armhf". https://github.com/xen-tools/xen-tools/commit/83c37b476a7534c432ecc9941817aeb989677da6 There's "--nopygrub" but that doesn't work due to several issues, so removing "pygrub" from "distributions.conf" is the only way. Signed-off-by: Anthony PERARD --- ts-debian-install | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ts-debian-install b/ts-debian-install index c42e8a37..a737bec9 100755 --- a/ts-debian-install +++ b/ts-debian-install @@ -78,6 +78,21 @@ sub ginstall () { fi END } + + if ($ho->{Suite} =~ m/bookworm/) { + # remove "pygrub" from /etc/xen-tools/distributions.conf + # The "--nopygrub" option doesn't work. + # https://github.com/xen-tools/xen-tools/issues/67 + # https://github.com/xen-tools/xen-tools/issues/68 + target_editfile_root($ho, "/etc/xen-tools/distributions.conf", sub { + while (<::EI>) { + unless (m/^#/) { + s/ pygrub\b//; + } + print ::EO or die $!; + } + }); + } my $cmd = ''; my $useproxy = $c{DebianMirrorProxy} // $c{HttpProxy}; $cmd .= < X-Patchwork-Id: 13595632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1174AC54E5D for ; Mon, 18 Mar 2024 17:02:07 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694987.1084463 (Exim 4.92) (envelope-from ) id 1rmGN2-0007af-9y; Mon, 18 Mar 2024 17:01:56 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694987.1084463; Mon, 18 Mar 2024 17:01:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGN2-0007aY-6v; Mon, 18 Mar 2024 17:01:56 +0000 Received: by outflank-mailman (input) for mailman id 694987; Mon, 18 Mar 2024 17:01:55 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHc-0002f9-VH for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:20 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6f1a7b56-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:16 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-414624a65beso23055e9.3 for ; Mon, 18 Mar 2024 09:56:16 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:15 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6f1a7b56-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780975; x=1711385775; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UQG3ZS/KBjrX61gOBxTf9yeYNXKYHvM6r6BPx94cQKs=; b=fJK4BJ2mYlO7zN2Vef512nm9m3Uqv81Bmis0gqsEdCT4kE5bMgWrgNSslWytVDqwHs sGjRLf4T3H5tPZkJfWFB+kTTP76lGH/FwhYEh4PFdhurYexZrshmCvZOUI8phFoPSfrn 5TIIYAGydoi7jERBCM29O3+T9qjXUwq1LATi4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780975; x=1711385775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UQG3ZS/KBjrX61gOBxTf9yeYNXKYHvM6r6BPx94cQKs=; b=XGjMQshHKgBNUBVHcptEV/7rlZuh4s4dwjiPaINy2MLLqm2I50F5VOX3HCkgvDWhsE gEdoO8dXJRutNbF5TjLcrOBHW/UoX26wbUMXZJnTbt722ZOtktsdLA/tydUWbB0VCT01 9ILahsh21pTo4eEyUQqgXfeIDnoDTKgC3IFP9a6ND9peXFIA1Gv44q5azczQctXhpB1k oixHYnGk9rlLDQq7ejmESaNFXgF2rBOoYeX45jPaqxwUKAt43uN1VrvjLN+G5csCpbyU EonMdt8p0VI/t7Ly59gC8/p+RUrpuEQULERH88ifVJ2yFtKwR0S6JUjsjaHyaIkpBbE6 BxzQ== X-Gm-Message-State: AOJu0YzeVLd1NTHCian01YUDdJqDtvI5XS2h8uW/S7mQIJt26AJOZdFm EYucUfwDX41xyfKEYvMNfePUvBcz1dmCZTyU1DrF9ZcoL+N+UwEb2x8uGJ+zCUvrrsLRpMG+3NU W X-Google-Smtp-Source: AGHT+IFxPNgilfqdmRvgJO2Paa+HImA+CbRYKWFQN+pgq1nbnYiSEISR9mtJGNc7Acdzf42snqeVxQ== X-Received: by 2002:a05:600c:3c99:b0:413:fa31:b9f6 with SMTP id bg25-20020a05600c3c9900b00413fa31b9f6mr9694564wmb.2.1710780975478; Mon, 18 Mar 2024 09:56:15 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 29/36] ts-debian-hvm-install: Increase min guest ram size Date: Mon, 18 Mar 2024 16:55:38 +0000 Message-Id: <20240318165545.3898-30-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 768 MB for the guest isn't enough anymore for Debian Bookworm, at boot it print this message: Low memory ---------- Entering low memory mode This system has relatively little free memory, so it will enter low memory mode. Among other things, this means that this program will proceed in English. You should set up swap space as soon as possible. [Press enter to continue] So, automatic installation fails. An empiric test shows that the min was 817M for one particular situation (test-amd64-amd64-xl-qemuu-ovmf-amd64) but we probably need some leg room, so increase to 1 GB. Signed-off-by: Anthony PERARD --- ts-debian-hvm-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 44eb3ab1..60c95b37 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -241,7 +241,7 @@ sub prep () { if ($host_freemem_mb > $ram_lots * 2 + $ram_minslop) { $ram_mb = $ram_lots; } else { - $ram_mb = 768; + $ram_mb = 1024; } } logm("Host has $host_freemem_mb MB free memory, setting guest memory size to $ram_mb MB"); From patchwork Mon Mar 18 16:55:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595649 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 348EDC54E5D for ; Mon, 18 Mar 2024 17:09:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695045.1084580 (Exim 4.92) (envelope-from ) id 1rmGUP-0006xB-Ih; Mon, 18 Mar 2024 17:09:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695045.1084580; Mon, 18 Mar 2024 17:09:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGUP-0006x4-Fl; Mon, 18 Mar 2024 17:09:33 +0000 Received: by outflank-mailman (input) for mailman id 695045; Mon, 18 Mar 2024 17:09:31 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHf-0002f9-VT for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:23 +0000 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [2a00:1450:4864:20::12d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 701ff6ff-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:17 +0100 (CET) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-514a8259ec1so720216e87.1 for ; Mon, 18 Mar 2024 09:56:17 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:15 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 701ff6ff-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780977; x=1711385777; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=26YSZw65woreMekmmn6Dys3A1EFQ0HIUWGVRQycHsIA=; b=lDt3dD2YEOvV7jYoX+yOtRTa/U9GeAg230Ch6ClUKZNsNcKu93NAgoQIwUffXMAf7F eGx8K6DMb9TqwBqUi7S025YsDngwPorPycZtwYD0Q/OIhxRHbyhVPBa/39uYJzLisS7w iCdpA13Nm6+FY8V/qe+ItpKztQGDZJA8Wh49o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780977; x=1711385777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=26YSZw65woreMekmmn6Dys3A1EFQ0HIUWGVRQycHsIA=; b=IjLgjRTsq1+y4mjjbIN2GUictcxCKdIitqnXi38IVfdDMUdxG/vXluXnoWSvgceCPu dBqoxslNlq42mR0AFSoTbq9AQDYX6SwrV4sxUeUgeGuJLaszBiXNWyg5QEb8jvYeFUUT 9CHI18eSmyhA+RyaftDnE5e9RezQD2PBFieqYPKkuoyIOPwNTtGH/ycYZ+aV1XK9GH04 l3T8g/7kZIYBOIou66zuYaBdGjtAkftLbo2ow5a2SdF4JcBUIgwluvw1ZfyBrlDe5s+d 6v8q5PbkJBgTIE5bWYq0S3kW133STwtV/AM1o2s3n94U2kZcyEJ6AUjhtwldrFvzDzEv ycuA== X-Gm-Message-State: AOJu0Yz+cA6vFAhf1XxUlyN0QiFsGyinAz5yyByFwbe0lD9NoBswqhxA 7DwVs+P5zjBj+i7elll+m3YtFJJEKKio8AE2ZWyGoTA1L5B+paAK4KHn+wNA65G9Qx8ms1gpIcE 9 X-Google-Smtp-Source: AGHT+IHNvBn6bt5Kf5bfRGG5GOc9SND8iAJEbFJzJD9VDG2AybdY+1uUbYspTd+5fAPaNfFNoJ+wkw== X-Received: by 2002:a19:3802:0:b0:513:9dba:f32e with SMTP id f2-20020a193802000000b005139dbaf32emr7240835lfa.20.1710780976204; Mon, 18 Mar 2024 09:56:16 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 30/36] bookworm: Extend guest bootloader workaround Date: Mon, 18 Mar 2024 16:55:39 +0000 Message-Id: <20240318165545.3898-31-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 68f1be60..3545f3fd 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1176,7 +1176,7 @@ END logm("\$arch is $arch, \$suite is $suite"); if ($xopts{PvMenuLst} && $arch =~ /^arm/ && - $suite =~ /wheezy|jessie|stretch|buster|sid/ ) { + $suite =~ /wheezy|jessie|stretch|buster|bookworm|sid/ ) { # Debian doesn't currently know what bootloader to install in # a Xen guest on ARM. We install pv-grub-menu above which From patchwork Mon Mar 18 16:55:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595631 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC331C54E5D for ; Mon, 18 Mar 2024 17:00:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.694970.1084454 (Exim 4.92) (envelope-from ) id 1rmGLA-0005jz-V9; Mon, 18 Mar 2024 17:00:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 694970.1084454; Mon, 18 Mar 2024 17:00:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGLA-0005jo-SK; Mon, 18 Mar 2024 17:00:00 +0000 Received: by outflank-mailman (input) for mailman id 694970; Mon, 18 Mar 2024 17:00:00 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHe-0002gq-ML for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:22 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 707d6999-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:18 +0100 (CET) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-41412411622so7208055e9.2 for ; Mon, 18 Mar 2024 09:56:18 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:17 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 707d6999-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780978; x=1711385778; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lK2cvliT/wP/P+dntCPCcmtTOpkXUdusD9n6Lp67sAk=; b=tW3C9f30kdt60lR85/Am5g4IJvgOtwUMgxtW3HxkSCrVDqxiS1fL3SdRPWYpUx8BQJ w8iMNpwOxXy1WC5aLbl68W046fIFTwHYb9up60tqSKvy1hQKLp6Dj3aEX1E6LWTPkDpe dnq8Afhk7dBuxeF6YwdM/Xp5EAagIpKXOYGy8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780978; x=1711385778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lK2cvliT/wP/P+dntCPCcmtTOpkXUdusD9n6Lp67sAk=; b=NFsdnL0Sna9GLYsLXiH4oev/w+40O30M0SubH8hJqSSVK11hb8OQwU2MCv0QhrNhER yzgV2503KqKm34cfL7fPNcro0o3JIUwq7aAGx8Cc/sLOgUiiH6o0P8yLV1tXKlwdqz/Y a5aJdP4U0ApGqGLFLVN12G+wVHTqQ12PgJsj6mkDmwXTN5IV9VTx1CA94n4XRkdeikQq xfOvqIQZEoRsJ9UhezQYT3S1QDxz1Fvu19wAANUZKfpvrOkZq0uGwpRouu0pXz8UykPY kQY0eX0CPks82dtbtnQnjBFKNFSDx+TIX8YYyJh+kdwRFglsY62qHYxLcUgdeObF2a4s FXSA== X-Gm-Message-State: AOJu0YwCoTR2dFm+Kt+pCh9igngas1ikJ2zRL3q9Nih5kcmOCCVt2TVC /+lGw+8bFu05a7x0Lp2vdeWadShzuvcSt4v20sxpn6ZG59QQpQdPODvqhFZyvbtO0kI/U8lxxX2 c X-Google-Smtp-Source: AGHT+IFPTCcS1tWzDisEsT1f0NHG2uvx3CWNDZzxVre6NX5O2l2B7vmONi9UUzvm02FKWwJeRPV7Hw== X-Received: by 2002:a05:600c:35cd:b0:413:286c:4fcf with SMTP id r13-20020a05600c35cd00b00413286c4fcfmr8561862wmq.32.1710780977800; Mon, 18 Mar 2024 09:56:17 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 31/36] ts-debian-*-install: Replace dots in hostnames by dashs Date: Mon, 18 Mar 2024 16:55:40 +0000 Message-Id: <20240318165545.3898-32-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 When running ./ts-debian-di-install, hostname on the command line is interpreted by the debian installer. As the installer find it to be a FQDN, it uses part of the hostname as the domain, thus overwriting the value from the DHCP and from d-i netcfg/get_domain setting (maybe). But the result is that /etc/resolv.conf contains "search bookworm.guest.osstest" and can't find an IP for "cache". So the installation fails. Also replace ".guest.osstest" in a few other places, even if it may not be an issue. Signed-off-by: Anthony PERARD --- ts-debian-di-install | 4 ++-- ts-debian-hvm-install | 2 +- ts-debian-install | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index d84407cf..06c7e1f4 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -68,8 +68,8 @@ our $ram_mb= $r{arch} =~ m/^armhf/ ? 768 : 2048; our $disk_mb= 10000; our $guesthost= $gn. - ($r{"${gn}_suite"} ? ".".$r{"${gn}_suite"} : ""). - ".guest.osstest"; + ($r{"${gn}_suite"} ? "-".$r{"${gn}_suite"} : ""). + "-guest-osstest"; our $gho; sub prep () { diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install index 60c95b37..99e9acae 100755 --- a/ts-debian-hvm-install +++ b/ts-debian-hvm-install @@ -46,7 +46,7 @@ our $ho= selecthost($whhost); our $ram_mb; our $disk_mb= 10000; -our $guesthost= "$gn.guest.osstest"; +our $guesthost= "$gn-guest-osstest"; our $gho; our ($kernel, $ramdisk); diff --git a/ts-debian-install b/ts-debian-install index a737bec9..62db487a 100755 --- a/ts-debian-install +++ b/ts-debian-install @@ -34,7 +34,7 @@ our $ram_mb= 512; our $swap_mb= 1000; our $disk_mb= 10000; -our $guesthost= "$gn.guest.osstest"; +our $guesthost= "$gn-guest-osstest"; our $gho; sub prep () { From patchwork Mon Mar 18 16:55:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595634 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1928FC54E71 for ; Mon, 18 Mar 2024 17:05:25 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695007.1084497 (Exim 4.92) (envelope-from ) id 1rmGQG-0001Gh-Mh; Mon, 18 Mar 2024 17:05:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695007.1084497; Mon, 18 Mar 2024 17:05:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGQG-0001EE-HK; Mon, 18 Mar 2024 17:05:16 +0000 Received: by outflank-mailman (input) for mailman id 695007; Mon, 18 Mar 2024 17:05:16 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHf-0002gq-MT for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:23 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 71039d29-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:19 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41460512c25so3834195e9.0 for ; Mon, 18 Mar 2024 09:56:19 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:18 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 71039d29-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780978; x=1711385778; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eqQ7r3Pddk0MZXZyItvqBWjUPFkKGqn9CfcnBLkApoY=; b=R82t1X7Hb2BXFNWAyMJJ6OMAY5LcdLg5UIFR6bop7gLZYgsJKqiIDfzrcu/qpao7dO RJWj2Ci4mQzcX2fyVGGdMZvBkqBtJFOgYS+1SMZrabpH11imGbAonFoO4DBIasuYVea5 7b34yvgeGK5UO3btwjZT3lsOfN4K8bpP+X57U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780978; x=1711385778; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eqQ7r3Pddk0MZXZyItvqBWjUPFkKGqn9CfcnBLkApoY=; b=tftK2BQMPHwW0Yl/wQGAoOzq1p7IZq+TO0N3cp9RT0tm7nzjl+CqZ4/gM3vWNwsEOx S9PJf+ysGBHE5l6PSTFoxDa2ols/g5Fcte8tmjM0UwH3MptKJ773VLw2hzNfwQ8Eg/Qr 6tiCKDWv/3hDv7qGdeh0PD3XgIBv4kge4due22G4Bemo5YxEQK4M21TqKodRUly3o1YG AI29+7prVOuft1orDiQOSvgl/uNGCcvVDiqJHhYowVdUcKVDirqTySLYJV14nCGFcA39 /nCNvJxDFxmM1xWUnTONusfg131cyhlj6PUvCPYhCC3JdAxxKaD8xfJ+QmoILgvDSIk3 Hx5w== X-Gm-Message-State: AOJu0YxZn+G4Z44fatGgrOgJiPWcL62U32a06MVtPPvV5Z2tTWM4G5XF UCBGLq0ov2PuUbOgbBDfcQQH2uI00k1rzFYRD6NDCMBZB/98S+TKopJvQ8HfqI9X2m95Oe6VLsU / X-Google-Smtp-Source: AGHT+IH0aBLlGgXNfgE33Vjye1egy0i8b9q5S/eE5gjpBCD8+7jCZaD72rCLuHhv9Ye6YEzpQjWnzQ== X-Received: by 2002:a05:600c:4f0d:b0:413:e19:337f with SMTP id l13-20020a05600c4f0d00b004130e19337fmr5780538wmq.22.1710780978639; Mon, 18 Mar 2024 09:56:18 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 32/36] ts-xen-install: Fix bridge setup, ask to copy MAC addr Date: Mon, 18 Mar 2024 16:55:41 +0000 Message-Id: <20240318165545.3898-33-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 This ask to copy the MAC address from $physif on the bridge. On Debian Bookworm, when running as a Xen guest for nested tests, the bridge does get a random MAC address and a different IP address from DHCP than before setting up the bridge, so the test fails. Signed-off-by: Anthony PERARD --- ts-xen-install | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ts-xen-install b/ts-xen-install index 3a913fce..645d8a79 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -312,6 +312,9 @@ sub ensurebridge () { bridge_ports $physif bridge_fd 0 bridge_stp off +END + $bridgex .= <{Suite} !~ m/wheezy|jessie|stretch|buster/); + bridge_hw $physif END } else { $iface= $physif; From patchwork Mon Mar 18 16:55:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DFBE2C54E58 for ; Mon, 18 Mar 2024 17:05:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695013.1084527 (Exim 4.92) (envelope-from ) id 1rmGQf-0002lN-3z; Mon, 18 Mar 2024 17:05:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695013.1084527; Mon, 18 Mar 2024 17:05:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGQf-0002lD-0C; Mon, 18 Mar 2024 17:05:41 +0000 Received: by outflank-mailman (input) for mailman id 695013; Mon, 18 Mar 2024 17:05:40 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHi-0002f9-WF for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:27 +0000 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [2a00:1450:4864:20::133]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 716cf32a-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:19 +0100 (CET) Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-513d599dbabso5033435e87.1 for ; Mon, 18 Mar 2024 09:56:19 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:18 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 716cf32a-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780979; x=1711385779; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q3vLBOSxqrdW1ZRlzp2JKO4obw5qcJjbVid5cQeTQ14=; b=WXwQLoXK73ObfQXEhFAIknmDFXH5xMhZQ+qxUDfEsWdGBnxHXhXvJ0+QMc3Qyry4XI 67iD0PAx1iOreXMZOfkM2lfBct/PUYKGiwcBXtBM71bkMDUz0BhCGT4M41aCraoXTHbX MqcWM96h/+Fh19iU0Sb4cSZ7qzy7jtzwZpqbc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780979; x=1711385779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q3vLBOSxqrdW1ZRlzp2JKO4obw5qcJjbVid5cQeTQ14=; b=Go/pet0TA196x3hRyekhz2kXJFSWkdYqjL82nwqqYx/CzsV8L/oR/aagzh2ueOMwdb pUTj0HU80m0fkfUOAI3vYCKCL838wUFXDyfL85bukwqXOadq0boANrfrGpCE4cZiCVcN 5PAMo4Kw12cu96oYSu2htdEUn6G+iH9K7K1ubcEFTuUNOZd79w2BZHES5ZP4E1GnQ9YC 5fb74P2kG7YlyPSxVBKElq7Bz1qoyv3gP5lPRsGTtCYRZOCqRynGMZt9zyPDqa9uda1h OzOeQ2TqOrMMG3w45646vqPTys5g2FviigB6dviZjoWDepTiSUAtTndaTqbALVKhWcwI Ik8g== X-Gm-Message-State: AOJu0YzwfadnqXIr5X0znizP1yqFLK/6BCKO4Eu12z8UBDy39MZyE4wi fo/asEZkXkAPcU+xOT84R8PXqIxR/aPazEaGcjBh5rziM7+xfRkYDtDdQJfucmek1M0zAqZXGQA j X-Google-Smtp-Source: AGHT+IHTjDi3PCaX5GpW4hpbi7vkp6ckj5GyoCXCDwO2h82tEGArbcK7PZeZoQUmIY5Nf4BfEIhO+Q== X-Received: by 2002:a19:2d5c:0:b0:513:c757:33d9 with SMTP id t28-20020a192d5c000000b00513c75733d9mr44876lft.53.1710780979365; Mon, 18 Mar 2024 09:56:19 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 33/36] make-flight: Keep using buster for L2 guest in nested tests Date: Mon, 18 Mar 2024 16:55:42 +0000 Message-Id: <20240318165545.3898-34-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 When starting the installation of the L2 guest, L0 kills L1. Switching the L2 guest back to Debian Buster works fine, so do that to prevent regression in the test. Part of the logs from the host L0: > domain_crash called from arch/x86/hvm/vmx/vvmx.c:2770 > Domain 3 (vcpu#0) crashed on cpu#4: > d3v0 vmentry failure (reason 0x80000021): Invalid guest state (2) Signed-off-by: Anthony PERARD --- make-flight | 15 ++++++++++++++- mfi-common | 5 +++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/make-flight b/make-flight index 155a0c1f..d0c950bc 100755 --- a/make-flight +++ b/make-flight @@ -360,6 +360,19 @@ do_hvm_debian_nested_tests () { xen-4.3-testing) return;; esac + local l2_runvar + case $guestsuite in + bookworm) + # Bookworm install image lead to a crash of l1, so keep using + # Buster's image. + l2_runvar=(l2_suite=buster) + l2_runvar+=(l2_image=$(usual_debianhvm_image amd64 buster)) + ;; + *) + l2_runvar=(l2_image=$(usual_debianhvm_image amd64)) + ;; + esac + for cpuvendor in amd intel; do job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-nested-$cpuvendor \ @@ -368,7 +381,7 @@ do_hvm_debian_nested_tests () { l1_vifmodel='e1000' \ l1_memsize='3072' \ l1_enable_nestedhvm='true' \ - l2_image=$(usual_debianhvm_image amd64) \ + ${l2_runvar[@]} \ bios=$bios \ all_hostflags=$most_hostflags,hvm-$cpuvendor diff --git a/mfi-common b/mfi-common index 6dc39422..bbe714bf 100644 --- a/mfi-common +++ b/mfi-common @@ -547,18 +547,19 @@ job_create_test () { usual_debianhvm_image () { local arch=$1; shift + local suite=${1:-$guestsuite} if [ -n "$DEBIAN_IMAGE_FILE" ]; then echo $DEBIAN_IMAGE_FILE return fi - local file=`getconfig DebianImageFile_${guestsuite}_${arch}` + local file=`getconfig DebianImageFile_${suite}_${arch}` if [ -n "$file" ]; then echo $file return fi local ver=$DEBIAN_IMAGE_VERSION if [ -z "$ver" ] ; then - ver=`getconfig DebianImageVersion_$guestsuite` + ver=`getconfig DebianImageVersion_$suite` fi echo debian-$ver-$arch-CD-1.iso } From patchwork Mon Mar 18 16:55:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595648 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9CD4AC54E5D for ; Mon, 18 Mar 2024 17:08:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695035.1084566 (Exim 4.92) (envelope-from ) id 1rmGTd-00060g-8r; Mon, 18 Mar 2024 17:08:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695035.1084566; Mon, 18 Mar 2024 17:08:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGTd-00060Z-6J; Mon, 18 Mar 2024 17:08:45 +0000 Received: by outflank-mailman (input) for mailman id 695035; Mon, 18 Mar 2024 17:08:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHh-0002gq-My for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:25 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 71e78ade-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:20 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-41413f7b2dfso5573675e9.2 for ; Mon, 18 Mar 2024 09:56:20 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:19 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 71e78ade-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780980; x=1711385780; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kpV3y5oudWDxMbRb7L99Hd6enDOLIEEjJdtB4aBntcc=; b=db6ssZCUQVyUol5ukSBeJ5x9Awo95esHs4pLqSqhU9jU+TpuYMVQdynicHUeeib2yD /Wei8LCLSTRtimSO9fi71KwPuq08tVm/0/34o1WRanVc9F8abfZ5tzM90OfmcVSjPb9z DeISju6cREjBdMUbGSUPcbtOhsu0AufF/clhE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780980; x=1711385780; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kpV3y5oudWDxMbRb7L99Hd6enDOLIEEjJdtB4aBntcc=; b=iVZj427Lh19cyq2OST1CojWXmxvIWI8vO5BlDOyqgd+noIde5QYeBUSck5S3CXNv6w 00FfFHbDoCcIvPeXiO27prMquwU8bU/pAsm3bDmtZ6l8zroF9t5YRaYi2jWO29yvkrrl JXpw5CkdcatDUbXlI19f8g8FGflsoZTjq1an3ifRh+/dcd0l4J1DvRSsMIjyaj/1FJxI 6zvbmt5CctUmSUt1MyKWgpka1e9AP/RolbOZ7bh63htlER/i4NZouo1rFXsQPev99/zt JsDL5A8G2r4vqduHinye6+9JPXM2nxOVnxqEBBn25PdSb7JAjntq57ERhE179+xSeNHQ LrkA== X-Gm-Message-State: AOJu0Yx4Yd0Q0l9iNcwqbaOQF55FlEZ9XcIIpxM/aCacb0a7ogUV1ZN1 xncVBdUrfY6hLm7Inx3DU0hCshYRyh261gw46Z/5RATVj3bHaostOlzXmlKZ6Ne4owMryiO94tQ j X-Google-Smtp-Source: AGHT+IG4Cmmc0rd0wtw3C3CQayvvKemrNI+DJdbL7oeBPz+ppHszenmK2b33mLfvVO7fciQ3SPGfDQ== X-Received: by 2002:a05:600c:5105:b0:412:ed3f:1b4b with SMTP id o5-20020a05600c510500b00412ed3f1b4bmr8596847wms.11.1710780980145; Mon, 18 Mar 2024 09:56:20 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 34/36] Temporally switch "qemu-mainline" branch to Bookworm Date: Mon, 18 Mar 2024 16:55:43 +0000 Message-Id: <20240318165545.3898-35-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 QEMU doesn't build on buster anymore. This should be remove once bookworm is the default suite. Signed-off-by: Anthony PERARD --- make-flight | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/make-flight b/make-flight index d0c950bc..6e88cb13 100755 --- a/make-flight +++ b/make-flight @@ -49,6 +49,11 @@ case "$xenbranch" in ;; esac +# QEMU doesn't build on buster anymore, use bookworm for it. +case "$branch" in + qemu-mainline) defsuite="bookworm" ;; +esac + # Pick default Debian Installer version to correspond to the chosen # suite. if [ -z "$defdi_version" ] ; then From patchwork Mon Mar 18 16:55:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595652 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 71733C54E5D for ; Mon, 18 Mar 2024 17:11:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695060.1084610 (Exim 4.92) (envelope-from ) id 1rmGVr-0001ZU-Ei; Mon, 18 Mar 2024 17:11:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695060.1084610; Mon, 18 Mar 2024 17:11:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGVr-0001ZN-BG; Mon, 18 Mar 2024 17:11:03 +0000 Received: by outflank-mailman (input) for mailman id 695060; Mon, 18 Mar 2024 17:11:02 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHj-0002gq-NK for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:27 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 724c0068-e548-11ee-afdd-a90da7624cb6; Mon, 18 Mar 2024 17:56:21 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-413f76fcf41so33704655e9.3 for ; Mon, 18 Mar 2024 09:56:21 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:20 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 724c0068-e548-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780981; x=1711385781; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1sfVt8Xg23JpHHAPGe+eT+E0bwcscFUgALb2j8zZ/sQ=; b=M37dCuSMZTmRJh6f3u3SFKEzJPGbjvQg9Oj5X3bc0/6UTGnLDHsuIcWpM+EwxhPCSc PH/Laz8oE5ZQGzDE1IECLkajDO/JktHbuvcehMy+eV7fvXJgysVsn2HQJ0DikRxMB3Ir QeBcCtjmCDHrjusqMo24upertDPE/idlC8Rug= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780981; x=1711385781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sfVt8Xg23JpHHAPGe+eT+E0bwcscFUgALb2j8zZ/sQ=; b=Of3i9shqpgc2vPuXJCc/6PP9MECT5PjcVwAqGx/2F41yfqR6AbCxKl5hqYeLoOfPp2 1DbB3LVkx/SnlOvId8PDwPyK6cmEHK3QO5vY+zAeaRwE6gV054TnBY2e27ecVxfXqgt6 sNzZrQLSrg2+a07gvGTFCwW7YrEzD/VCW/rY7mkLPojrbFzrkiW4S4QR3DrrmeO4w/jJ rZNUHval4OirIBSc89aWzloqGbm5VgrYYc7E5wZLesqDYzXfvMSCnOdwV8YM62p3zZi7 VejHBvz16HxYttqv6mGh6xRltJH0NnAWPnt67/DdqctxD+Ue1YwM2B2pnvmkttiRATnV FHWQ== X-Gm-Message-State: AOJu0YyplUZJg+hwFvF3IFsLYzbNJg5fpAvXC6VweEjP2iy3bgUvzAX8 tcvVXwNPRcO17ZnkcY3dl64rn7YR8NWBvjqm6wcH9yWc3Ic3n5VtEShG+2eCtp743Q2R+nwJs/8 Q X-Google-Smtp-Source: AGHT+IEMiO/AgdmTkpOqiPg6/8IU763h7xjEO1zx085zwYqqGt7cc1QJOnPJDF+WPxzm9Tujczh2FQ== X-Received: by 2002:a05:600c:5490:b0:414:846:4469 with SMTP id iv16-20020a05600c549000b0041408464469mr7010wmb.38.1710780980802; Mon, 18 Mar 2024 09:56:20 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 35/36] Switch to Debian Bookworm as default suite Date: Mon, 18 Mar 2024 16:55:44 +0000 Message-Id: <20240318165545.3898-36-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Xen 4.17 doesn't build with Debian Bookworm. It fails to build IPXE/etherboot, on "amd64". So we keep using Debian Buster on Xen 4.18 and earlier branches. Xen 4.18 builds 4.17 via job "build-amd64-prev". Xen 4.17 would needs 18a36b4a9b08 ("tools: ipxe: update for fixing build with GCC12") which is only in Xen 4.18. Signed-off-by: Anthony PERARD --- Osstest.pm | 2 +- make-flight | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Osstest.pm b/Osstest.pm index a559ca4e..9ac2dc5c 100644 --- a/Osstest.pm +++ b/Osstest.pm @@ -87,7 +87,7 @@ our %c = qw( Images images - DebianSuite buster + DebianSuite bookworm DebianMirrorSubpath debian TestHostKeypairPath id_rsa_osstest diff --git a/make-flight b/make-flight index 6e88cb13..0b528629 100755 --- a/make-flight +++ b/make-flight @@ -43,17 +43,13 @@ case "$xenbranch" in xen-4.3-testing) defsuite="wheezy"; defguestsuite="wheezy";; xen-4.9-testing) defsuite="stretch"; defguestsuite="stretch";; xen-4.10-testing) defsuite="stretch"; defguestsuite="stretch";; + xen-4.1[1-8]-testing) defsuite="buster"; defguestsuite="buster";; *) defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` ;; esac -# QEMU doesn't build on buster anymore, use bookworm for it. -case "$branch" in - qemu-mainline) defsuite="bookworm" ;; -esac - # Pick default Debian Installer version to correspond to the chosen # suite. if [ -z "$defdi_version" ] ; then From patchwork Mon Mar 18 16:55:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13595651 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BA3CAC54E5D for ; Mon, 18 Mar 2024 17:11:00 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.695058.1084601 (Exim 4.92) (envelope-from ) id 1rmGVh-0001Ci-8o; Mon, 18 Mar 2024 17:10:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 695058.1084601; Mon, 18 Mar 2024 17:10:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGVh-0001Cb-4D; Mon, 18 Mar 2024 17:10:53 +0000 Received: by outflank-mailman (input) for mailman id 695058; Mon, 18 Mar 2024 17:10:51 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rmGHk-0002f9-0A for xen-devel@lists.xenproject.org; Mon, 18 Mar 2024 16:56:28 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 72dd039b-e548-11ee-a1ee-f123f15fe8a2; Mon, 18 Mar 2024 17:56:22 +0100 (CET) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-512e4f4e463so5154828e87.1 for ; Mon, 18 Mar 2024 09:56:22 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id a18-20020a05600c349200b0041413d11838sm2020141wmq.26.2024.03.18.09.56.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 09:56:21 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 72dd039b-e548-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710780981; x=1711385781; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a6SOJAPHzTw3MYpCL3W6xE70pNKEvpjBBoKho15ndy8=; b=kRiQYmPdBe14TBvTEtSjLETcNPXCowgqpeTGJcPEwXdFDJR91J0yECQqdn+NqMBp8x 7qCrxiRuQdT2yIJ/wkX0RFP7iNjQBNw+arRnchNkGamF+lvLsOVHLzU8UpK7BJVRB3Cy F5BgwPAutrCrl2uxU0K44tJ2mWrDykzAM/1GY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710780981; x=1711385781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a6SOJAPHzTw3MYpCL3W6xE70pNKEvpjBBoKho15ndy8=; b=k3WIgaPNxd2Q0OM22lEKLjPyDF+JCUDVYOKIUH/Cqo+N7wieLVAPpzgFx6cf8xIYmo uzmyntnLVOX09nvU2By/qfgZacRDARMqiBUMkqnRlbO+0Hls6HBvtMsH3r2s7DoG9uqf Wcpu34gMZCwLxNJ6Fic8amwJhrqyoSQWzATVltOdH69UhxJxNGU/Pb6RhGZlWnRtw4vv zyB0P+VdVxvhHbObfUCqJEGYRE5crKgu8SIfbTIHKsCVX/KCijX2dcPQZsvF8K6ahi+7 +N/gvpdJtm9ep0JSvM+edMjhW/axa1p3ht3Ur0rpET9k0VyJWxeF3rA5L5Hjx3hRbpmI nhDw== X-Gm-Message-State: AOJu0Yy0nY9f960kBqkbNP+G+ErMk4FJKCUYqKluSPqLyyiSoo+LQq+m 3UhdSWnbGkSWdvplyyrYT/0Yph2fxwyAaiKAPNpP18F5vzi/VAknBly4XPbknqmRY+Pco+pcJfc b X-Google-Smtp-Source: AGHT+IFmG58z5oOeybe79OGRLnMNdyftivOKXgykL/ptl1wsy9WLHmGjr9kBMpbh1ubkmFjsj7ZC7A== X-Received: by 2002:a19:9118:0:b0:513:d71e:eeb4 with SMTP id t24-20020a199118000000b00513d71eeeb4mr7066453lfd.18.1710780981703; Mon, 18 Mar 2024 09:56:21 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 36/36] make-hosts-flight: default to bookworm Date: Mon, 18 Mar 2024 16:55:45 +0000 Message-Id: <20240318165545.3898-37-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- make-hosts-flight | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-hosts-flight b/make-hosts-flight index 63ac7b71..0177f605 100755 --- a/make-hosts-flight +++ b/make-hosts-flight @@ -26,7 +26,7 @@ blessing=$4 buildflight=$5 : ${ALL_ARCHES:=amd64 i386 arm64 armhf} -: ${ALL_SUITES:=buster stretch jessie} +: ${ALL_SUITES:=bookworm buster stretch jessie} # ^ most preferred suite first : ${PERHOST_MAXWAIT:=20000} # seconds From patchwork Tue Apr 2 10:08:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13613645 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D411FC6FD1F for ; Tue, 2 Apr 2024 10:08:59 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.700083.1092679 (Exim 4.92) (envelope-from ) id 1rrb4W-0004Rq-BH; Tue, 02 Apr 2024 10:08:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 700083.1092679; Tue, 02 Apr 2024 10:08:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rrb4W-0004Rj-66; Tue, 02 Apr 2024 10:08:52 +0000 Received: by outflank-mailman (input) for mailman id 700083; Tue, 02 Apr 2024 10:08:50 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rrb4U-0004Rb-RA for xen-devel@lists.xenproject.org; Tue, 02 Apr 2024 10:08:50 +0000 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [2a00:1450:4864:20::32b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ffa3c609-f0d8-11ee-a1ef-f123f15fe8a2; Tue, 02 Apr 2024 12:08:48 +0200 (CEST) Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-415644aca59so16423865e9.0 for ; Tue, 02 Apr 2024 03:08:48 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c450a00b004161b59e230sm1421620wmo.41.2024.04.02.03.08.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 03:08:47 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ffa3c609-f0d8-11ee-a1ef-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1712052528; x=1712657328; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZXpWGhb4xf3iNSzyENKiQCvAOMXFRR6+0bjqv2ZNwIc=; b=ko6OeyfHuko6Wgp67UV1WGaBdj8EMBo26cm+EYzAQ9tdkPyjNuX7LN+nwP/8Kfz4uD 8FTyYmLjMc7XlFxwRXZvTf9OhrQJG52UPDLbxPW1bu7dGYatjiH0Td+3WOpTQ5MEaSCJ nv0ogGbyd+fmGrWvuhEloHPDamkdlHFmXEfQg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712052528; x=1712657328; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZXpWGhb4xf3iNSzyENKiQCvAOMXFRR6+0bjqv2ZNwIc=; b=YqCHDATFscZRwdu+9lB7HXV6ED4jsAq7i3wA+Y5godl4/oeTC8O6eQSoazHMiUN8iZ WepcddJZj01XshLFpFkvURVvcgLeS6DwU+2yfmaFwXZt2dZqp4z2aVq4FJcaryk68SNT iypkNvYT7yxdabGuCQw/GNb26ez+i5E4rXZsLvTacsTUaoo53e0YdMElzuO8s70aTB7B eLKG3LhN59zmZRU7v7lsi6ZW9WoQ0m1KochC7sEp3VDnwSPF/3zx3ybp2KYbK5a8/tOs wgWpuwZp/B3IOdlcgisFlb8lvkCtSp2+pxyzw2UUYWnTfvk26C5OtilQ7z2pqIQq+1BG 6yEg== X-Gm-Message-State: AOJu0YygcUq6chDCwoXk0ezb8k5gnZIRciNuIrgBeUtnkpFP+JzP56+0 TTNnmWfDzza5gaXpd9/xbcRrJNVPGz92phU2YmM3VZ4ZVGRr2E5hby1G2ELg4DFFvOX3RgGMclQ t X-Google-Smtp-Source: AGHT+IH0nBIudDQBtRAxphUS3pqLsVieqqncVYFmQzJIE/r/6YLKJVXwHXOv0vu4bpJJChW/OXHw+g== X-Received: by 2002:a05:600c:304a:b0:414:8c06:5c32 with SMTP id n10-20020a05600c304a00b004148c065c32mr985044wmh.14.1712052528099; Tue, 02 Apr 2024 03:08:48 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH 37/36] production-config: Set Bookworm's debian-installer version Date: Tue, 2 Apr 2024 11:08:10 +0100 Message-Id: <20240402100810.42386-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318165545.3898-1-anthony.perard@citrix.com> References: <20240318165545.3898-1-anthony.perard@citrix.com> MIME-Version: 1.0 Signed-off-by: Anthony PERARD --- I've got this one more patch to add to the series, which I forgot to write. I'll put it before "Switch to Debian Bookworm as default suite" when I'll push the rest of the series. production-config | 1 + 1 file changed, 1 insertion(+) diff --git a/production-config b/production-config index 6345c40c..0eb8f0f3 100644 --- a/production-config +++ b/production-config @@ -92,6 +92,7 @@ TftpDiVersion_wheezy 2016-06-08 TftpDiVersion_jessie 2018-06-26 TftpDiVersion_stretch 2020-09-24 TftpDiVersion_buster 2023-06-20 +TftpDiVersion_bookworm 2024-03-26 DebianSnapshotBackports_jessie http://snapshot.debian.org/archive/debian/20190206T211314Z/