From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <s.ivanov@proxmox.com> 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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 94E8A6D564 for <pve-devel@lists.proxmox.com>; Tue, 28 Sep 2021 11:30:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 84D15B9EB for <pve-devel@lists.proxmox.com>; Tue, 28 Sep 2021 11:29:43 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 13747B9DE for <pve-devel@lists.proxmox.com>; Tue, 28 Sep 2021 11:29:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D32CC4241F for <pve-devel@lists.proxmox.com>; Tue, 28 Sep 2021 11:29:42 +0200 (CEST) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 28 Sep 2021 11:29:29 +0200 Message-Id: <20210928092929.955327-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.388 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 Subject: [pve-devel] [PATCH pve-kernel-meta/pve-kernel-5.4] boot-tool: prefer PVE for systemd-boot loader title X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 28 Sep 2021 09:30:13 -0000 From: Fabian Grünbichler <f.gruenbichler@proxmox.com> like for Grub where this is handled via snippets with PVE > PMG > PBS. Reported-by: Oguz Bektas <o.bektas@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> (cherry picked from commit 40d8d36eef7935ee386edbdf5328f3b6421ff899) Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- this patch is the only relevant one currently on master and not on pve-kernel-5.4 (the others are version bumps and the changed upload target) proxmox-boot/zz-proxmox-boot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proxmox-boot/zz-proxmox-boot b/proxmox-boot/zz-proxmox-boot index 42b0f01..244fe8e 100755 --- a/proxmox-boot/zz-proxmox-boot +++ b/proxmox-boot/zz-proxmox-boot @@ -31,7 +31,9 @@ trap cleanup EXIT INT TERM QUIT . /usr/share/pve-kernel-helper/scripts/functions LOADER_TITLE="Proxmox Virtual Environment" -if [ -d /usr/share/doc/proxmox-mailgateway/ ]; then +if [ -d /etc/pve/ ]; then + LOADER_TITLE="Proxmox Virtual Environment" +elif [ -d /usr/share/doc/proxmox-mailgateway/ ]; then LOADER_TITLE="Proxmox Mailgateway" elif [ -d /usr/share/doc/proxmox-backup/ ]; then LOADER_TITLE="Proxmox Backup Server" -- 2.30.2