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 4CF9760920 for ; Thu, 13 Aug 2020 12:46:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44335194F9 for ; Thu, 13 Aug 2020 12:46:22 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 80736194EF for ; Thu, 13 Aug 2020 12:46:21 +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 4E328445E9 for ; Thu, 13 Aug 2020 12:46:21 +0200 (CEST) Date: Thu, 13 Aug 2020 12:46:14 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20200812181227.14454-1-s.ivanov@proxmox.com> In-Reply-To: <20200812181227.14454-1-s.ivanov@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1597315568.6arm2i012e.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 Adjusted score from AWL reputation of From: address 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] applied: [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: Thu, 13 Aug 2020 10:46:52 -0000 On August 12, 2020 8:12 pm, Stoiko Ivanov wrote: > currently the installer prepares the ESP disks for ZFS, irrespective of t= he > boot-mode (EFI, legacy) - in order to enable users to change the boot-mod= e > in the BIOS and keep the system bootable. >=20 > This patch updates /etc/kernel/cmdline in both boot-modes, which is neces= sary > to make the system actually bootable (else the systemd-boot config uses > the cmdline from the installer). >=20 > 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 >=20 > proxinstall | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) >=20 > 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=3D.*/GRUB_CMDLINE_LINUX=3D= \"root=3DZFS=3D$zfspoolname\\/ROOT\\/$zfsrootvolname boot=3Dzfs\"/' $target= dir/etc/default/grub") =3D=3D 0 || > die "unable to update /etc/default/grub\n"; > =20 > - if ($boot_type eq 'efi') { > - write_config("root=3DZFS=3D$zfspoolname/ROOT/$zfsrootvolname boot=3Dzf= s", "$targetdir/etc/kernel/cmdline"); > - } > + write_config("root=3DZFS=3D$zfspoolname/ROOT/$zfsrootvolname boot= =3Dzfs", "$targetdir/etc/kernel/cmdline"); > =20 > } > =20 > --=20 > 2.20.1 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20 =