all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-kernel-meta/pve-kernel-5.4] boot-tool: prefer PVE for systemd-boot loader title
Date: Tue, 28 Sep 2021 11:29:29 +0200	[thread overview]
Message-ID: <20210928092929.955327-1-s.ivanov@proxmox.com> (raw)

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





             reply	other threads:[~2021-09-28  9:30 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28  9:29 Stoiko Ivanov [this message]
2021-09-30 15:48 ` [pve-devel] applied: " Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210928092929.955327-1-s.ivanov@proxmox.com \
    --to=s.ivanov@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal