diff options
| author | Simon Rettberg | 2018-03-28 10:33:08 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-03-28 10:33:08 +0200 |
| commit | 21d784d55adeefc63ed23d50fadedd1c463a166a (patch) | |
| tree | 41c66e48e18bcc0bf03d1ced506fe376c1073645 /modules-available/vmstore/baseconfig/getconfig.inc.php | |
| parent | [permissionmanager] fixed tree issue with deselecting parent-permissions (Tic... (diff) | |
| parent | [minilinux] permission 'show' => 'view' (diff) | |
| download | slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.gz slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.xz slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/vmstore/baseconfig/getconfig.inc.php')
| -rw-r--r-- | modules-available/vmstore/baseconfig/getconfig.inc.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules-available/vmstore/baseconfig/getconfig.inc.php b/modules-available/vmstore/baseconfig/getconfig.inc.php index 75f7279b..3bad16e1 100644 --- a/modules-available/vmstore/baseconfig/getconfig.inc.php +++ b/modules-available/vmstore/baseconfig/getconfig.inc.php @@ -9,11 +9,17 @@ if (is_array($vmstore) && isset($vmstore['storetype'])) { break; case 'nfs'; ConfigHolder::add("SLX_VM_NFS", $vmstore['nfsaddr']); + if (!empty($vmstore['nfsopts'])) { + ConfigHolder::add("SLX_VM_NFS_OPTS", $vmstore['nfsopts']); + } break; case 'cifs'; ConfigHolder::add("SLX_VM_NFS", $vmstore['cifsaddr']); ConfigHolder::add("SLX_VM_NFS_USER", $vmstore['cifsuserro']); ConfigHolder::add("SLX_VM_NFS_PASSWD", $vmstore['cifspasswdro']); + if (!empty($vmstore['cifsopts'])) { + ConfigHolder::add("SLX_VM_NFS_OPTS", $vmstore['cifsopts']); + } break; } } |