From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 2A2CE1FF09B for ; Mon, 28 Sep 2026 07:48:27 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id E0FE5216B2; Mon, 28 Sep 2026 07:48:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=genua.de; s=202307; t=1790574467; bh=sGgzTqtAJqcSkmThQVMBjO2bgto0m08MURKxOAkboLc=; h=Date:From:To:Subject:References:In-Reply-To:From; b=AE7st+fW4x+ZPN3+2Avsk/3Kyt5pDHm5jeqWHL/TVaWKcaKN9VtRUF4j9wMnK8gwJ xnK2Af1TccF4tJEFQt/J+5kB4uC7TrrAav2DTd8USES9SLFC9ZFD8IBHm5TowTNLPV Q8SWqKX1pBptjRqw4HaPMicZaKDh2DiMpNMG0MWqH0RwBGr9ZtHhpdXptCB6kRRS+V jF/ma6zjUNorxJjWwwpwDxjCQjOUHsNBLGYzuoTzEbdM2ReoPHTDOA4/sVH4FoDvUO 3lcGoiG3It226YCLgGyENn+PGdaGWVeJ9mqPL68/cSFubtUkezNQEwVi41Fitk4NGc J0nUO5tKrB0Aw== Date: Mon, 28 Sep 2026 07:47:46 +0200 From: Christian Ludwig To: Subject: [PATCH v2 pve-storage 1/16] plugin: add efi-firmware content type Message-ID: References: MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [192.168.217.185] X-ClientProxiedBy: kch1-mta09.win.genua.de (10.208.16.109) To kch1-mta07.win.genua.de (10.208.16.107) Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-SPAM-LEVEL: Spam detection results: 0 AWL 0.102 Adjusted score from AWL reputation of From: address DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain DMARC_PASS -0.1 DMARC pass policy SPF_HELO_PASS -0.001 SPF: HELO matches SPF record SPF_PASS -0.001 SPF: sender matches SPF record UNPARSEABLE_RELAY 0.001 Informational: message has unparseable relay lines Message-ID-Hash: WANFZAQSF37F2FOSOGAUUXKTU4RRMMQH X-Message-ID-Hash: WANFZAQSF37F2FOSOGAUUXKTU4RRMMQH X-MailFrom: christian_ludwig@genua.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Holds custom OVMF code images in the efi-firmware/ subdirectory of a storage. File names are restricted to the safe character class. Signed-off-by: Christian Ludwig --- src/PVE/Storage/Plugin.pm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 4f69f9b..f6ca140 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -372,7 +372,7 @@ PVE::JSONSchema::register_format('pve-storage-content', \&verify_content); sub verify_content { my ($ct, $noerr) = @_; - return $ct if $ct eq 'import'; + return $ct if $ct eq 'import' || $ct eq 'efi-firmware'; my $valid_content = valid_content_types('dir'); # dir includes all other types @@ -831,6 +831,8 @@ sub parse_volname { m!^import/(${PVE::Storage::SAFE_CHAR_WITH_WHITESPACE_CLASS_RE}+$PVE::Storage::IMPORT_EXT_RE_1)$! ) { return ('import', $1, undef, undef, undef, undef, $2); + } elsif ($volname =~ m!^efi-firmware/(${PVE::Storage::SAFE_CHAR_CLASS_RE}+)$!) { + return ('efi-firmware', $1, undef, undef, undef, undef, 'raw'); } die "unable to parse directory volume name '$volname'\n"; @@ -844,6 +846,7 @@ my $vtype_subdirs = { backup => 'dump', snippets => 'snippets', import => 'import', + 'efi-firmware' => 'efi-firmware', }; sub get_vtype_subdirs { @@ -1753,6 +1756,10 @@ my $get_subdir_files = sub { m!/(${PVE::Storage::SAFE_CHAR_CLASS_RE}+$PVE::Storage::IMPORT_EXT_RE_1)$!i; $info = { volid => "$sid:import/$1", format => "$2" }; + } elsif ($tt eq 'efi-firmware') { + next if $fn !~ m!/(${PVE::Storage::SAFE_CHAR_CLASS_RE}+)$!i; + + $info = { volid => "$sid:efi-firmware/$1", format => 'raw' }; } $info->{size} = $st->size; @@ -1789,6 +1796,8 @@ sub list_volumes { $data = $get_subdir_files->($storeid, $path, 'snippets'); } elsif ($type eq 'import') { $data = $get_subdir_files->($storeid, $path, 'import'); + } elsif ($type eq 'efi-firmware' && !defined($vmid)) { + $data = $get_subdir_files->($storeid, $path, 'efi-firmware'); } } -- 2.34.1