aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Stefan Haischt <dsh@pfsense.org>2007-01-14 17:22:46 +0000
committerDaniel Stefan Haischt <dsh@pfsense.org>2007-01-14 17:22:46 +0000
commit76a712084540d5654911c6ee6cf1a2b930894a3e (patch)
tree08ca7afbbe1a90c6f61a80cc4df06114cd8a987d
parenta4ab3d4d3600c5b97fb5a4f7b8b84f7e95d60782 (diff)
downloadpfsense-packages-76a712084540d5654911c6ee6cf1a2b930894a3e.tar.gz
pfsense-packages-76a712084540d5654911c6ee6cf1a2b930894a3e.tar.bz2
pfsense-packages-76a712084540d5654911c6ee6cf1a2b930894a3e.zip
* fix: -> -mapall and -maproot mutually exclusive
-rw-r--r--packages/freenas/pkg/freenas_services.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/packages/freenas/pkg/freenas_services.inc b/packages/freenas/pkg/freenas_services.inc
index 8d6f1940..184be1ec 100644
--- a/packages/freenas/pkg/freenas_services.inc
+++ b/packages/freenas/pkg/freenas_services.inc
@@ -417,17 +417,13 @@ function services_nfs_configure() {
$a_mount = &$freenas_config['mounts']['mount'];
foreach ($a_mount as $mount) {
+ /* -mapall and -maproot mutually exclusive */
+ $mapping = $freenas_config['nfs']['mapall'] == "yes" ? "-mapall=root" : "-maproot=root";
+
$nfsconf .= <<<EOD
-/mnt/{$mount['sharename']} -alldirs -maproot=root
-EOD;
-
- if ($freenas_config['nfs']['mapall'] == "yes") {
- $nfsconf .= <<<EOD
--mapall=root
+/mnt/{$mount['sharename']} -alldirs {$mapping}
EOD;
- }
-
$nfsconf .= <<<EOD
-network {$network} -mask $subnet