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 494E06067C for ; Wed, 12 Aug 2020 20:13:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CE411316C for ; Wed, 12 Aug 2020 20:12:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 15D4313161 for ; Wed, 12 Aug 2020 20:12:47 +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 D512B445BD for ; Wed, 12 Aug 2020 20:12:46 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 12 Aug 2020 20:12:27 +0200 Message-Id: <20200812181227.14454-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 installer] fix 2925: edit /etc/kernel/cmdline unconditionally 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: Wed, 12 Aug 2020 18:13:18 -0000 currently the installer prepares the ESP disks for ZFS, irrespective of the boot-mode (EFI, legacy) - in order to enable users to change the boot-mode in the BIOS and keep the system bootable. This patch updates /etc/kernel/cmdline in both boot-modes, which is necessary to make the system actually bootable (else the systemd-boot config uses the cmdline from the installer). Signed-off-by: Stoiko Ivanov --- steps to reproduce the issue: * install pve 6.2 with ZFS on root from iso on a seabios vm * after install stop the VM and change the BIOS to OVMF * start the vm proxinstall | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/proxinstall b/proxinstall index 556c509..c011825 100755 --- a/proxinstall +++ b/proxinstall @@ -1737,9 +1737,7 @@ _EOD syscmd("sed -i -e 's/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"root=ZFS=$zfspoolname\\/ROOT\\/$zfsrootvolname boot=zfs\"/' $targetdir/etc/default/grub") == 0 || die "unable to update /etc/default/grub\n"; - if ($boot_type eq 'efi') { - write_config("root=ZFS=$zfspoolname/ROOT/$zfsrootvolname boot=zfs", "$targetdir/etc/kernel/cmdline"); - } + write_config("root=ZFS=$zfspoolname/ROOT/$zfsrootvolname boot=zfs", "$targetdir/etc/kernel/cmdline"); } -- 2.20.1