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 EF49575A48 for ; Thu, 22 Apr 2021 13:18:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3A8E31AF22 for ; Thu, 22 Apr 2021 13:18:12 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 177E91AEB2 for ; Thu, 22 Apr 2021 13:18:09 +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 E656042149 for ; Thu, 22 Apr 2021 13:18:08 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Thu, 22 Apr 2021 13:18:01 +0200 Message-Id: <20210422111801.4193-9-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210422111801.4193-1-s.ivanov@proxmox.com> References: <20210422111801.4193-1-s.ivanov@proxmox.com> 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 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 1/1] always boot zfs with proxmox-boot-tool 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, 22 Apr 2021 11:18:13 -0000 proxmox-boot-tool now supports configuring grub to boot from the ESPs the installer creates on all (bootable) disks - use this approach for zfs installs. Signed-off-by: Stoiko Ivanov --- best viewed with `git show -w` proxinstall | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/proxinstall b/proxinstall index 03f6ec7..3395fa2 100755 --- a/proxinstall +++ b/proxinstall @@ -1224,11 +1224,11 @@ my sub chroot_chmod { die "chroot: unable to change permission mode for '$path'\n"; } -sub prepare_systemd_boot_esp { +sub prepare_proxmox_boot_esp { my ($espdev, $targetdir) = @_; - syscmd("chroot $targetdir pve-efiboot-tool init $espdev") == 0 || - die "unable to init ESP and install systemd-boot loader on '$espdev'\n"; + syscmd("chroot $targetdir proxmox-boot-tool init $espdev") == 0 || + die "unable to init ESP and install proxmox-boot loader on '$espdev'\n"; } sub prepare_grub_efi_boot_esp { @@ -1820,19 +1820,19 @@ _EOD foreach my $di (@$bootdevinfo) { my $dev = $di->{devname}; - if (!$native_4k_disk_bootable) { - eval { - syscmd("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 || - die "unable to install the i386-pc boot loader on '$dev'\n"; - }; - push @$bootloader_err_list, $@ if $@; - } + if ($use_zfs) { + prepare_proxmox_boot_esp($di->{esp}, $targetdir); + } else { + if (!$native_4k_disk_bootable) { + eval { + syscmd("chroot $targetdir /usr/sbin/grub-install --target i386-pc --no-floppy --bootloader-id='proxmox' $dev") == 0 || + die "unable to install the i386-pc boot loader on '$dev'\n"; + }; + push @$bootloader_err_list, $@ if $@; + } eval { if (my $esp = $di->{esp}) { - if ($use_zfs) { - prepare_systemd_boot_esp($esp, $targetdir); - } else { prepare_grub_efi_boot_esp($dev, $esp, $targetdir); } } -- 2.20.1