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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 644BF7060B for ; Thu, 24 Jun 2021 12:58:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5147EA20F for ; Thu, 24 Jun 2021 12:57:30 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D1049A204 for ; Thu, 24 Jun 2021 12:57:29 +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 A345C4678F for ; Thu, 24 Jun 2021 12:57:29 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 24 Jun 2021 12:57:22 +0200 Message-Id: <20210624105722.1844748-1-f.gruenbichler@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.624 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 proxmox-ve] add grub.d snippet 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: Thu, 24 Jun 2021 10:58:00 -0000 to set distributor and disable os-prober. this allows us to drop grub cfg handling from the installer except for the ZFS on / use case. Signed-off-by: Fabian Grünbichler --- Notes: adding the root=ZFS=.. boot=zfs to the kernel cmdline could also be done in the installer with a snippet - by referencing $GRUB_DEFAULT_CMDLINE, like kdump-tools does: GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT other-options.." debian/grub/proxmox-ve.cfg | 2 ++ debian/proxmox-ve.install | 1 + 2 files changed, 3 insertions(+) create mode 100644 debian/grub/proxmox-ve.cfg diff --git a/debian/grub/proxmox-ve.cfg b/debian/grub/proxmox-ve.cfg new file mode 100644 index 0000000..d10da36 --- /dev/null +++ b/debian/grub/proxmox-ve.cfg @@ -0,0 +1,2 @@ +GRUB_DISTRIBUTOR="Proxmox VE" +GRUB_DISABLE_OS_PROBER=true diff --git a/debian/proxmox-ve.install b/debian/proxmox-ve.install index 5780d2a..406f575 100644 --- a/debian/proxmox-ve.install +++ b/debian/proxmox-ve.install @@ -1,2 +1,3 @@ debian/apthook/10pveapthook etc/apt/apt.conf.d/ debian/apthook/pve-apt-hook usr/share/proxmox-ve/ +debian/grub/proxmox-ve.cfg etc/default/grub.d/ -- 2.30.2