proxmox-mirrors/pve-installer
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-installer synced 2025-08-17 23:21:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move secure boot state to RunEnv

Browse Source 
as preparation for using it in more than one place.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2024-04-23 14:27:53 +02:00 committed by Thomas Lamprecht
parent c8160a3f1c
commit 5364c0c116
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Proxmox/Install.pm
View File

@ -15,7 +15,7 @@ use Proxmox::Install::StorageConfig;
use Proxmox::Sys::Block qw(get_cached_disks wipe_disk partition_bootable_disk); use Proxmox::Sys::Block qw(get_cached_disks wipe_disk partition_bootable_disk);
use Proxmox::Sys::Command qw(run_command syscmd); use Proxmox::Sys::Command qw(run_command syscmd);
use Proxmox::Sys::File qw(file_read_all file_read_firstline file_write_all); use Proxmox::Sys::File qw(file_read_firstline file_write_all);
use Proxmox::UI; use Proxmox::UI;
# TODO: move somewhere better? # TODO: move somewhere better?
@ -576,20 +576,12 @@ my sub chroot_chmod {
} }
sub prepare_proxmox_boot_esp { sub prepare_proxmox_boot_esp {
my ($espdev, $targetdir) = @_; my ($espdev, $targetdir, $secureboot) = @_;
my $mode = ''; my $mode = '';
# detect secure boot being enabled and switch to grub-on-ESP if it is # if secure boot is enabled switch to grub-on-ESP
if (-d "/sys/firmware/efi") { $mode = 'grub' if $secureboot;
my $content = eval { file_read_all("/sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c") };
if ($@) {
warn "Failed to read secure boot state: $@\n";
} else {
my @secureboot = unpack("CCCCC", $content);
$mode = 'grub' if $secureboot[4] == 1;
}
}
syscmd("chroot $targetdir proxmox-boot-tool init $espdev $mode") == 0 || syscmd("chroot $targetdir proxmox-boot-tool init $espdev $mode") == 0 ||
die "unable to init ESP and install proxmox-boot loader on '$espdev'\n"; die "unable to init ESP and install proxmox-boot loader on '$espdev'\n";
@ -1237,7 +1229,7 @@ _EOD
foreach my $di (@$bootdevinfo) { foreach my $di (@$bootdevinfo) {
my $dev = $di->{devname}; my $dev = $di->{devname};
if ($use_zfs) { if ($use_zfs) {
prepare_proxmox_boot_esp($di->{esp}, $targetdir); prepare_proxmox_boot_esp($di->{esp}, $targetdir, $run_env->{secure_boot});
} else { } else {
if (!$native_4k_disk_bootable) { if (!$native_4k_disk_bootable) {
eval { eval {

12
Proxmox/Install/RunEnv.pm
View File

@ -8,7 +8,7 @@ use JSON qw(from_json to_json);
use Proxmox::Log; use Proxmox::Log;
use Proxmox::Sys::Command qw(run_command CMD_FINISHED); use Proxmox::Sys::Command qw(run_command CMD_FINISHED);
use Proxmox::Sys::File qw(file_read_firstline); use Proxmox::Sys::File qw(file_read_all file_read_firstline);
use Proxmox::Sys::Block; use Proxmox::Sys::Block;
use Proxmox::Sys::Net; use Proxmox::Sys::Net;
@ -285,6 +285,16 @@ sub query_installation_environment : prototype() {
$output->{hvm_supported} = query_cpu_hvm_support(); $output->{hvm_supported} = query_cpu_hvm_support();
$output->{boot_type} = -d '/sys/firmware/efi' ? 'efi' : 'bios'; $output->{boot_type} = -d '/sys/firmware/efi' ? 'efi' : 'bios';
if ($output->{boot_type} eq 'efi') {
my $content = eval { file_read_all("/sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c") };
if ($@) {
log_warn("Failed to read secure boot state: $@\n");
} else {
my @secureboot = unpack("CCCCC", $content);
$output->{secure_boot} = $secureboot[4] == 1;
}
}
my $err; my $err;
my $country; my $country;
if ($routes->{gateway4}) { if ($routes->{gateway4}) {