From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH installer] fix 2925: edit /etc/kernel/cmdline unconditionally
Date: Thu, 13 Aug 2020 12:46:14 +0200 [thread overview]
Message-ID: <1597315568.6arm2i012e.astroid@nora.none> (raw)
In-Reply-To: <20200812181227.14454-1-s.ivanov@proxmox.com>
On August 12, 2020 8:12 pm, Stoiko Ivanov wrote:
> 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 <s.ivanov@proxmox.com>
> ---
> 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
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2020-08-13 10:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-12 18:12 [pve-devel] " Stoiko Ivanov
2020-08-13 10:46 ` Fabian Grünbichler [this message]
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=1597315568.6arm2i012e.astroid@nora.none \
--to=f.gruenbichler@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox