From: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH V2 storage 1/2] fix #2920: add options parameter to cifs plugin
Date: Fri, 29 Jul 2022 15:46:06 +0200 [thread overview]
Message-ID: <20220729134607.2984970-2-s.hrdlicka@proxmox.com> (raw)
In-Reply-To: <20220729134607.2984970-1-s.hrdlicka@proxmox.com>
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 <s.hrdlicka@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2022-07-29 13:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 13:46 [pve-devel] [PATCH V2 storage 0/2] cifs plugin - add options parameter Stefan Hrdlicka
2022-07-29 13:46 ` Stefan Hrdlicka [this message]
2022-07-29 13:46 ` [pve-devel] [PATCH V2 docs 2/2] fix #2920: add cifs " Stefan Hrdlicka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220729134607.2984970-2-s.hrdlicka@proxmox.com \
--to=s.hrdlicka@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox