From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 819E31FF15F for ; Mon, 16 Dec 2024 18:21:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81DE61297C; Mon, 16 Dec 2024 18:21:54 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 16 Dec 2024 18:21:31 +0100 Message-Id: <20241216172132.235857-3-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241216172132.235857-1-f.schauer@proxmox.com> References: <20241216172132.235857-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 container 2/3] config: support printing a device 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Filip Schauer --- src/PVE/LXC/Config.pm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 5cc37f7..b44bcce 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -1333,6 +1333,14 @@ sub parse_volume { return; } +sub print_volume { + my ($class, $key, $volume) = @_; + + return $class->print_ct_unused($volume) if $key =~ m/^unused(\d+)$/; + + return $class->print_ct_mountpoint($volume, $key eq 'rootfs'); +} + sub parse_device { my ($class, $device_string, $noerr) = @_; @@ -1350,12 +1358,10 @@ sub parse_device { return $res; } -sub print_volume { - my ($class, $key, $volume) = @_; - - return $class->print_ct_unused($volume) if $key =~ m/^unused(\d+)$/; +sub print_device { + my ($class, $info) = @_; - return $class->print_ct_mountpoint($volume, $key eq 'rootfs'); + return PVE::JSONSchema::print_property_string($info, $dev_desc); } sub volid_key { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel