From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 98CCC69460 for ; Fri, 11 Mar 2022 20:06:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A84627EE4 for ; Fri, 11 Mar 2022 20:06:01 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7D0FC27EB4 for ; Fri, 11 Mar 2022 20:06:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 480C946B3C for ; Fri, 11 Mar 2022 20:06:00 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 11 Mar 2022 20:05:43 +0100 Message-Id: <20220311190548.2937377-6-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220311190548.2937377-1-s.ivanov@proxmox.com> References: <20220311190548.2937377-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.217 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-kernel-meta v3 5/8] proxmox-boot: remove now obsolete EFI/proxmoxdir if it exists X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2022 19:06:01 -0000 this can be dropped in the next major version - so keeping it as separate commit. Signed-off-by: Stoiko Ivanov --- proxmox-boot/zz-proxmox-boot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot index fa0ea4a..39e3bea 100755 --- a/proxmox-boot/zz-proxmox-boot +++ b/proxmox-boot/zz-proxmox-boot @@ -163,6 +163,12 @@ remove_old_kernels() { rm -rf "${esp}/loader/entries/proxmox-${kver}.conf" done + # FIXME: can be dropped in PVE 8.0 + if [ -d "${esp}/${PMX_ESP_DIR}" ]; then + warn " Removing legacy kernel location ${esp}/${PMX_ESP_DIR}" + rm -rf "${esp:?}/${PMX_ESP_DIR}" + fi + } set -- $DEB_MAINT_PARAMS -- 2.30.2