From nobody Mon Feb 9 03:18:38 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=eu.citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1589915479; cv=none; d=zohomail.com; s=zohoarc; b=IMln9XAe/iTHNc+UHCeomNSAqRTteh90Y5JJB/xmVUUSEUjoyb34obUwwNrmwixmKWD56ltZwcrda4as9UDHsw66SXAHCgJ3pPolomjaVD/YtygKIJCutx9AhKZ8oL6J4t4rNKSX9ZJUiJoMjV62qKKI5dyN8yPPAUabdERx6NQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589915479; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gzw9YFdAQu1E6I8pr305+7CRMQWqeTCnpXYtgjEzhtA=; b=kWHQMVc0wP+ABcDIwywXMICFqXAcZBC8bbNL9/z5y3tB+5V0pksNGWRgV7BFY3v11xZ/ifVDd07cMW0QbeNhJecWseTs0V3C0TflC/zbUgRTd0aD5kXo56eywTw0UV9/LjjMoJ1xcOkgvCzoKMWdsKdLHYTtsZwqO5i/BQmSyNA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1589915479068880.2720435313349; Tue, 19 May 2020 12:11:19 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7do-0007lJ-P7; Tue, 19 May 2020 19:11:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb7dn-0007k3-KF for xen-devel@lists.xenproject.org; Tue, 19 May 2020 19:11:03 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::3]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5e641cfa-9a04-11ea-b9cf-bc764e2007e4; Tue, 19 May 2020 19:10:14 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1jb7Vi-0001da-UW; Tue, 19 May 2020 20:02:42 +0100 X-Inumbo-ID: 5e641cfa-9a04-11ea-b9cf-bc764e2007e4 From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH 27/38] 20_linux_xen: Ignore xenpolicy and config files too Date: Tue, 19 May 2020 20:02:19 +0100 Message-Id: <20200519190230.29519-28-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519190230.29519-1-ian.jackson@eu.citrix.com> References: <20200519190230.29519-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" "file_is_not_sym" currently only checks for xen-syms. Extend it to disregard xenpolicy (XSM policy files) and files ending .config (which are built by the Xen upstream build system in some configurations and can therefore end up in /boot). Rename the function accordingly, to "file_is_not_xen_garbage". Signed-off-by: Ian Jackson --- overlay-buster/etc/grub.d/20_linux_xen | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/overlay-buster/etc/grub.d/20_linux_xen b/overlay-buster/etc/gr= ub.d/20_linux_xen index fb3ed82f..01dfcb57 100755 --- a/overlay-buster/etc/grub.d/20_linux_xen +++ b/overlay-buster/etc/grub.d/20_linux_xen @@ -167,10 +167,14 @@ if [ "x${linux_list}" =3D "x" ] ; then exit 0 fi =20 -file_is_not_sym () { +file_is_not_xen_garbage () { case "$1" in */xen-syms-*) return 1;; + */xenpolicy-*) + return 1;; + */*.config) + return 1;; *) return 0;; esac @@ -178,7 +182,7 @@ file_is_not_sym () { =20 xen_list=3D for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" ; then xen_li= st=3D"$xen_list $i" ; fi + if grub_file_is_not_garbage "$i" && file_is_not_xen_garbage "$i" ; the= n xen_list=3D"$xen_list $i" ; fi done prepare_boot_cache=3D boot_device_id=3D --=20 2.20.1