Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bergware
2023-05-24 18:51:23 +02:00
2 changed files with 24 additions and 6 deletions

View File

@@ -621,12 +621,9 @@ Share can *not* be deleted as long as it contains data. Be aware that some data
:end
:share_edit_exclusive_access_help:
When set to "yes" indicates a bind-mount directly to a pool has been set up for the share in the /mnt/user tree, provided the following
conditions are met:
When set to "Yes" indicates a synmlink directly to a pool has been set up for the share in the /mnt/user tree.
- Primary storage is a pool.
- Secondary storage is set to **none**.
- The share does not exist on any other volumes.
Refer to [Global Share Settings](Settings/ShareSettings) -> Permit exclusive shares.
:end
:share_edit_primary_storage_help:
@@ -1447,6 +1444,19 @@ Uncheck all disks in order to not exclude any disks
disks which represent a subset of the Included/Excluded disks defined here.
:end
:shares_exclusive_shares_help:
If set to Yes, share directories under /mnt/user are actually symlinks to the share directory on a storage volume
provided the following conditions are met:
* The Primary storage for a share is set to a pool.
* The Secondary storage for a share is set to **none**.
* The share exists on a single volume.
* The share is **not** exported over NFS.
The advantage of *exclusive* shares is that transfers bypass the FUSE layer which may significantly
increase I/O performance.
:end
:shares_tunable_hard_links_help:
If set to Yes then support the link() operation.
@@ -1849,7 +1859,7 @@ The metric value is optional, it defaults to 1. Use it to select the preferred g
:eth_network_extra_include_help:
Enter one or more interface names or IP addresses which will be included in the list of listening interfaces for local system services.
This is particular useful when the user has created custom interfaces (e.g. tailscale VPN tunnel) which are used to access local system services.
This is particularly useful when you have created custom interfaces (e.g. tailscale VPN tunnel) which are used to access local system services.
:end
:eth_network_extra_exclude_help:

View File

@@ -98,6 +98,14 @@ _(Excluded disk(s))_:
:shares_excluded_disks_help:
_(Permit exclusive shares)_:
: <select name="shareUserExclusive" <?=$disabled?>>
<?=mk_option($var['shareUserExclusive'], "no", _('No'))?>
<?=mk_option($var['shareUserExclusive'], "yes", _('Yes'))?>
</select>
:shares_exclusive_shares_help:
_(Tunable (support Hard Links))_:
: <select name="fuse_useino" <?=$disabled?>>
<?=mk_option($var['fuse_useino'], "no", _('No'))?>