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 EAC8689716 for ; Fri, 29 Jul 2022 15:46:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E8D0B1DC02 for ; Fri, 29 Jul 2022 15:46:32 +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 for ; Fri, 29 Jul 2022 15:46:32 +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 12B6842CAD for ; Fri, 29 Jul 2022 15:46:26 +0200 (CEST) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Fri, 29 Jul 2022 15:46:06 +0200 Message-Id: <20220729134607.2984970-2-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220729134607.2984970-1-s.hrdlicka@proxmox.com> References: <20220729134607.2984970-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 V2 storage 1/2] fix #2920: add options parameter to cifs plugin 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: Fri, 29 Jul 2022 13:46:33 -0000 this makes it possible to add all mount options offered by mount.cifs NFS & CIFS now share the options parameter since the use it for the same prupose Signed-off-by: Stefan Hrdlicka Reviewed-by: Fiona Ebner --- PVE/Storage/CIFSPlugin.pm | 16 +++++++++++++--- PVE/Storage/NFSPlugin.pm | 4 ---- PVE/Storage/Plugin.pm | 6 ++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index 982040a..62fa6d2 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -64,7 +64,7 @@ sub get_cred_file { } sub cifs_mount { - my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain) = @_; + my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain, $options) = @_; $server = "[$server]" if Net::IP::ip_is_ipv6($server); my $source = "//${server}/$share"; @@ -79,6 +79,7 @@ sub cifs_mount { } push @$cmd, '-o', defined($smbver) ? "vers=$smbver" : "vers=default"; + push @$cmd, '-o', $options if $options; run_command($cmd, errmsg => "mount error"); } @@ -144,6 +145,7 @@ sub options { mkdir => { optional => 1 }, bwlimit => { optional => 1 }, preallocation => { optional => 1 }, + options => { optional => 1 }, }; } @@ -231,8 +233,16 @@ sub activate_storage { die "unable to activate storage '$storeid' - " . "directory '$path' does not exist\n" if ! -d $path; - cifs_mount($server, $share, $path, $storeid, $scfg->{smbversion}, - $scfg->{username}, $scfg->{domain}); + cifs_mount( + $server, + $share, + $path, + $storeid, + $scfg->{smbversion}, + $scfg->{username}, + $scfg->{domain}, + $scfg->{options} + ); } $class->SUPER::activate_storage($storeid, $scfg, $cache); diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm index 5bd7313..f777483 100644 --- a/PVE/Storage/NFSPlugin.pm +++ b/PVE/Storage/NFSPlugin.pm @@ -69,10 +69,6 @@ sub properties { description => "Server IP or DNS name.", type => 'string', format => 'pve-storage-server', }, - options => { - description => "NFS mount options (see 'man nfs')", - type => 'string', format => 'pve-storage-options', - }, }; } diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 8a41df1..5029560 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -181,6 +181,12 @@ my $defaultData = { default => 'metadata', optional => 1, }, + options => { + description => "NFS/CIFS mount options (see 'man nfs' " . + "or 'man mount.cifs')", + type => 'string', format => 'pve-storage-options', + optional => 1, + }, }, }; -- 2.30.2