bugfixing

41 files changed, 68 insertions, 30 deletions

diff --git a/packages/freenas/pkg/freenas.inc b/packages/freenas/pkg/freenas.inc
index 4b21879f..1f514853 100644
--- a/packages/freenas/pkg/freenas.inc
+++ b/packages/freenas/pkg/freenas.inc
@@ -196,7 +196,7 @@ function custom_php_install_command() {
   
   if (! file_exists("/usr/local/etc/rc.d"))
     mwexec("mkdir -p /usr/local/etc/rc.d");
-    
+
   rename("/usr/local/pkg/rc.freenas", "/usr/local/etc/rc.d/rc.freenas");
   chmod ("/usr/local/etc/rc.d/rc.freenas", 0755);
 }
@@ -204,6 +204,7 @@ function custom_php_install_command() {
 function custom_php_deinstall_command() {
   oninstall_copy_kernel_binaries("deinstall");
   oninstall_copy_misc_binaries("deinstall");
-}
 
+  if (! file_exists("/usr/local/etc/rc.d"))
+    mwexec("rm -rf /usr/local/etc/rc.d");      }
 ?>
diff --git a/packages/freenas/pkg/freenas.xml b/packages/freenas/pkg/freenas.xml
index 5acbbdc7..5c52cb08 100644
--- a/packages/freenas/pkg/freenas.xml
+++ b/packages/freenas/pkg/freenas.xml
@@ -6,18 +6,17 @@
   <include_file>/usr/local/pkg/freenas.inc</include_file>
   <!-- Menu is where this packages menu will appear -->
   <menu>
-    <name>FreeNAS Disks</name>
+    <name>Disks</name>
     <section>System</section>
-    <configfile>freenas.xml</configfile>
-    <url>/disk_manage.php</url>
+    <url>/disks_manage.php</url>
   </menu>
   <menu>
-    <name>FreeNAS RAID</name>
+    <name>RAID</name>
     <section>System</section>
     <url>/disks_raid_gmirror.php</url>
   </menu>
   <menu>
-    <name>FreeNAS Mounts</name>
+    <name>Mounts</name>
     <section>System</section>
     <url>/disks_mount.php</url>
   </menu>
@@ -282,7 +281,8 @@
   <additional_files_needed>
     <prefix>/usr/local/pkg/</prefix>
     <chmod>0755</chmod>
-    <item>http://www.pfsense.com/packages/config/freenas/pkg/rc.freenas</item>
+    <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_system.inc</item>
+  </additional_files_needed>
   </additional_files_needed>
   <!-- kernel binaries -->
   <additional_files_needed>
diff --git a/packages/freenas/pkg/freenas_services.inc b/packages/freenas/pkg/freenas_services.inc
index a2d8d531..26455f8f 100644
--- a/packages/freenas/pkg/freenas_services.inc
+++ b/packages/freenas/pkg/freenas_services.inc
@@ -18,7 +18,7 @@
 	2. Redistributions in binary form must reproduce the above copyright
 	   notice, this list of conditions and the following disclaimer in the
 	   documentation and/or other materials provided with the distribution.
-	
+
 	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
 	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@@ -488,7 +488,7 @@ pasv_high_range={$freenas_config['ftp']['pasv_max_port']}
 EOD;
 		}
                 
-                $ftpconf =. <<<EOD
+                $ftpconf .= <<<EOD
 
 pasv_low_range = 2500
 pasv_high_range  = 3000
@@ -1228,12 +1228,12 @@ function services_avahi_configure() {
 EOD;
 	
 	/* kill any running dbus daemon */
-        sigkillbypid("{$g['varrun_path']}/dbus/dbus.pid"", "TERM");
+        sigkillbypid("{$g['varrun_path']}/dbus/dbus.pid", "TERM");
         
 	/* kill any running avahi daemons */
         mwexec("/usr/local/sbin/avahi-daemon -k");
 
-	
+
 	if (isset($config['system']['zeroconf_disable']))
 		return 0;
 	
@@ -1242,7 +1242,7 @@ EOD;
 	
         if (isset($config['system']['webgui']['port'])) {
                 $webservice = str_replace("@PORT@",
-                                          "{$config['system']['webgui']['port']}",
+                                          $config['system']['webgui']['port'],
                                           $service_template);
                 $webservice = str_replace("@TYPE@",
                                           "_http._tcp",
@@ -1272,15 +1272,15 @@ EOD;
                 file_put_contents("/usr/local/etc/avahi/services/http.service", $webservice);
         }
         
-	
+
 	
 	if (isset($freenas_config['afp']['enable'])) {
                 /* NOP */
 	}
-	
+
 	if (isset($freenas_config['rsyncd']['enable'])) 	{				
                 $rsyncservice = str_replace("@PORT@",
-                                          "{$config['rsyncd']['port']}",
+                                          $config['rsyncd']['port'],
                                           $service_template);
                 $rsyncservice = str_replace("@TYPE@",
                                           "_rsync._tcp",
@@ -1294,7 +1294,7 @@ EOD;
                                           
                 file_put_contents("/usr/local/etc/avahi/services/rsync.service", $rsyncservice);
 	}
-	
+
 	if (isset($config['sshd']['enable'])) 	{				
                 $sshservice = str_replace("@PORT@",
                                           "22",
diff --git a/packages/freenas/www/diag_ad_infos.php b/packages/freenas/www/diag_ad_infos.php
index b877c514..60ab806b 100644
--- a/packages/freenas/www/diag_ad_infos.php
+++ b/packages/freenas/www/diag_ad_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("Active Directory Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_ataidle_infos.php b/packages/freenas/www/diag_ataidle_infos.php
index cffccc8f..7d98a368 100644
--- a/packages/freenas/www/diag_ataidle_infos.php
+++ b/packages/freenas/www/diag_ataidle_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("ATAidle Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_disk_infos.php b/packages/freenas/www/diag_disk_infos.php
index 7cf1d71a..71a8d4c3 100644
--- a/packages/freenas/www/diag_disk_infos.php
+++ b/packages/freenas/www/diag_disk_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("Disk Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_fn_logs_daemon.php b/packages/freenas/www/diag_fn_logs_daemon.php
index d320caa9..de767763 100644
--- a/packages/freenas/www/diag_fn_logs_daemon.php
+++ b/packages/freenas/www/diag_fn_logs_daemon.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("Daemon"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_ftp.php b/packages/freenas/www/diag_fn_logs_ftp.php
index 6f29e986..608a326c 100644
--- a/packages/freenas/www/diag_fn_logs_ftp.php
+++ b/packages/freenas/www/diag_fn_logs_ftp.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("FTP"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_rsyncd.php b/packages/freenas/www/diag_fn_logs_rsyncd.php
index ac3b458a..230d492f 100644
--- a/packages/freenas/www/diag_fn_logs_rsyncd.php
+++ b/packages/freenas/www/diag_fn_logs_rsyncd.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("RSYNCD"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_samba.php b/packages/freenas/www/diag_fn_logs_samba.php
index 679c8826..df69d2c6 100644
--- a/packages/freenas/www/diag_fn_logs_samba.php
+++ b/packages/freenas/www/diag_fn_logs_samba.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("Samba"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_settings.php b/packages/freenas/www/diag_fn_logs_settings.php
index 1f4ada67..dcc45c40 100644
--- a/packages/freenas/www/diag_fn_logs_settings.php
+++ b/packages/freenas/www/diag_fn_logs_settings.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("Settings"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_smartd.php b/packages/freenas/www/diag_fn_logs_smartd.php
index c5e9cb88..568327e9 100644
--- a/packages/freenas/www/diag_fn_logs_smartd.php
+++ b/packages/freenas/www/diag_fn_logs_smartd.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("SMARTD"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_fn_logs_sshd.php b/packages/freenas/www/diag_fn_logs_sshd.php
index 56c6147a..77721ef4 100644
--- a/packages/freenas/www/diag_fn_logs_sshd.php
+++ b/packages/freenas/www/diag_fn_logs_sshd.php
@@ -35,7 +35,8 @@ $pgtitle = array(gettext("Diagnostics"),
                  gettext("System logs"),
                  gettext("SSHD"));
 
-require("guiconfig.inc");
+require_once("freenas_config.inc");
+require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
diff --git a/packages/freenas/www/diag_iscsi_infos.php b/packages/freenas/www/diag_iscsi_infos.php
index e90bf8ed..bbe11f0e 100644
--- a/packages/freenas/www/diag_iscsi_infos.php
+++ b/packages/freenas/www/diag_iscsi_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("iSCSI Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_mounts_infos.php b/packages/freenas/www/diag_mounts_infos.php
index 36bbec52..b3f39a74 100644
--- a/packages/freenas/www/diag_mounts_infos.php
+++ b/packages/freenas/www/diag_mounts_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("Mount Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_part_infos.php b/packages/freenas/www/diag_part_infos.php
index 7201f11c..a4a4332e 100644
--- a/packages/freenas/www/diag_part_infos.php
+++ b/packages/freenas/www/diag_part_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("Partition Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_raid_infos.php b/packages/freenas/www/diag_raid_infos.php
index b469aa52..2be95287 100644
--- a/packages/freenas/www/diag_raid_infos.php
+++ b/packages/freenas/www/diag_raid_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("RAID Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_smart_infos.php b/packages/freenas/www/diag_smart_infos.php
index 9a43e210..8ff1bf18 100644
--- a/packages/freenas/www/diag_smart_infos.php
+++ b/packages/freenas/www/diag_smart_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("SMART Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/diag_space_infos.php b/packages/freenas/www/diag_space_infos.php
index f30688e1..14ed437b 100644
--- a/packages/freenas/www/diag_space_infos.php
+++ b/packages/freenas/www/diag_space_infos.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Diagnostics"),
                  gettext("Space Infos"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_manage.php b/packages/freenas/www/disks_manage.php
index ee2e6dc0..d521ca2e 100644
--- a/packages/freenas/www/disks_manage.php
+++ b/packages/freenas/www/disks_manage.php
@@ -40,6 +40,7 @@ $pgtitle = array(gettext("System"),
                  gettext("Disks"),
                  gettext("Management"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_manage_edit.php b/packages/freenas/www/disks_manage_edit.php
index 416d9bc6..fedaba9b 100644
--- a/packages/freenas/www/disks_manage_edit.php
+++ b/packages/freenas/www/disks_manage_edit.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("Management"),
                  gettext("Edit"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_manage_init.php b/packages/freenas/www/disks_manage_init.php
index b6fce877..be7ec5f8 100644
--- a/packages/freenas/www/disks_manage_init.php
+++ b/packages/freenas/www/disks_manage_init.php
@@ -36,6 +36,7 @@ $pgtitle = array(gettext("System"),
                  gettext("Disks"),
                  gettext("Initialize"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_manage_iscsi.php b/packages/freenas/www/disks_manage_iscsi.php
index 4a156ee7..2aaf5cb9 100644
--- a/packages/freenas/www/disks_manage_iscsi.php
+++ b/packages/freenas/www/disks_manage_iscsi.php
@@ -36,13 +36,14 @@ $pgtitle = array(gettext("System"),
                  gettext("Disks"),
                  gettext("iSCSI Initiator"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
 if (! is_array($freenas_config['iscsi']))
 {
-	$freenas_config['iscsi'] = array();	
+	$freenas_config['iscsi'] = array();
 }
 
 $pconfig['enable'] = isset($freenas_config['iscsi']['enable']);
diff --git a/packages/freenas/www/disks_mount.php b/packages/freenas/www/disks_mount.php
index c5bd6f2b..c2cf2ea4 100644
--- a/packages/freenas/www/disks_mount.php
+++ b/packages/freenas/www/disks_mount.php
@@ -36,6 +36,7 @@ $pgtitle = array(gettext("System"),
                  gettext("Disks"),
                  gettext("Mount Point"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_mount_edit.php b/packages/freenas/www/disks_mount_edit.php
index 31221570..89fbc747 100644
--- a/packages/freenas/www/disks_mount_edit.php
+++ b/packages/freenas/www/disks_mount_edit.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("Mount Point"),
                  gettext("Edit"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gmirror.php b/packages/freenas/www/disks_raid_gmirror.php
index 4d51ba0f..ec926558 100644
--- a/packages/freenas/www/disks_raid_gmirror.php
+++ b/packages/freenas/www/disks_raid_gmirror.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Mirror"),
                  gettext("RAID"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gmirror_edit.php b/packages/freenas/www/disks_raid_gmirror_edit.php
index 4fba1242..e3ce6a2a 100644
--- a/packages/freenas/www/disks_raid_gmirror_edit.php
+++ b/packages/freenas/www/disks_raid_gmirror_edit.php
@@ -38,6 +38,7 @@ $pgtitle = array(gettext("System"),
                  gettext("RAID"),
                  gettext("Edit"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gmirror_infos.php b/packages/freenas/www/disks_raid_gmirror_infos.php
index e6b208e7..92614e89 100644
--- a/packages/freenas/www/disks_raid_gmirror_infos.php
+++ b/packages/freenas/www/disks_raid_gmirror_infos.php
@@ -92,10 +92,10 @@ echo $pfSenseHead->getHTML();
     <td class="tabnavtbl">
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Manage RAID"), false, "disks_raid_gvinum.php");
-	$tab_array[1] = array(gettext("Format RAID"), false, "disks_raid_gvinum_init.php");
-	$tab_array[2] = array(gettext("Tools"),       false, "disks_raid_gvinum_tools.php");
-  $tab_array[3] = array(gettext("Information"), true,  "disks_raid_gvinum_infos.php");
+	$tab_array[0] = array(gettext("Manage RAID"), false, "disks_raid_gmirror.php");
+	$tab_array[1] = array(gettext("Format RAID"), false, "disks_raid_gmirror_init.php");
+	$tab_array[2] = array(gettext("Tools"),       false, "disks_raid_gmirror_tools.php");
+  $tab_array[3] = array(gettext("Information"), true,  "disks_raid_gmirror_infos.php");
 	display_top_tabs($tab_array);
 ?>  
     </td>
diff --git a/packages/freenas/www/disks_raid_gmirror_init.php b/packages/freenas/www/disks_raid_gmirror_init.php
index c849be52..bb9a379a 100644
--- a/packages/freenas/www/disks_raid_gmirror_init.php
+++ b/packages/freenas/www/disks_raid_gmirror_init.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Mirror"),
                  gettext("Initialize"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gmirror_tools.php b/packages/freenas/www/disks_raid_gmirror_tools.php
index 714dea7f..35f9c5a9 100644
--- a/packages/freenas/www/disks_raid_gmirror_tools.php
+++ b/packages/freenas/www/disks_raid_gmirror_tools.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Mirror"),
                  gettext("Tools"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gvinum.php b/packages/freenas/www/disks_raid_gvinum.php
index 260fae14..47258f65 100644
--- a/packages/freenas/www/disks_raid_gvinum.php
+++ b/packages/freenas/www/disks_raid_gvinum.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Vinum"),
                  gettext("RAID"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gvinum_edit.php b/packages/freenas/www/disks_raid_gvinum_edit.php
index 45cbac88..dbf8ce1d 100644
--- a/packages/freenas/www/disks_raid_gvinum_edit.php
+++ b/packages/freenas/www/disks_raid_gvinum_edit.php
@@ -38,6 +38,7 @@ $pgtitle = array(gettext("System"),
                  gettext("RAID"),
                  gettext("Edit"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gvinum_infos.php b/packages/freenas/www/disks_raid_gvinum_infos.php
index 7b9cfcb2..eceb63be 100644
--- a/packages/freenas/www/disks_raid_gvinum_infos.php
+++ b/packages/freenas/www/disks_raid_gvinum_infos.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Vinum"),
                  gettext("Information"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gvinum_init.php b/packages/freenas/www/disks_raid_gvinum_init.php
index 2befcaa0..8b899dff 100644
--- a/packages/freenas/www/disks_raid_gvinum_init.php
+++ b/packages/freenas/www/disks_raid_gvinum_init.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Vinum"),
                  gettext("Initialize"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/disks_raid_gvinum_tools.php b/packages/freenas/www/disks_raid_gvinum_tools.php
index 97853e29..375c0224 100644
--- a/packages/freenas/www/disks_raid_gvinum_tools.php
+++ b/packages/freenas/www/disks_raid_gvinum_tools.php
@@ -37,6 +37,7 @@ $pgtitle = array(gettext("System"),
                  gettext("GEOM Vinum"),
                  gettext("Tools"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
@@ -174,7 +175,7 @@ echo $pfSenseHead->getHTML();
       						/* Force object state up */
       						system("/sbin/gvinum setstate -f up " . escapeshellarg($object));
       						break;
-      					case "saveconfig":					
+      					case "saveconfig":
       						/* Save config */
       						system("/sbin/gvinum saveconfig");
       						break;
diff --git a/packages/freenas/www/services_afp.php b/packages/freenas/www/services_afp.php
index c3648b9f..deee46f0 100644
--- a/packages/freenas/www/services_afp.php
+++ b/packages/freenas/www/services_afp.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Services"),
                  gettext("AFP"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/services_ftp.php b/packages/freenas/www/services_ftp.php
index da144349..3da55786 100644
--- a/packages/freenas/www/services_ftp.php
+++ b/packages/freenas/www/services_ftp.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Services"),
                  gettext("FTP"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/services_nfs.php b/packages/freenas/www/services_nfs.php
index 403ea17c..3ad897e2 100644
--- a/packages/freenas/www/services_nfs.php
+++ b/packages/freenas/www/services_nfs.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Services"),
                  gettext("NFS"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/services_rsyncd.php b/packages/freenas/www/services_rsyncd.php
index b28bca34..e4b744b7 100644
--- a/packages/freenas/www/services_rsyncd.php
+++ b/packages/freenas/www/services_rsyncd.php
@@ -36,6 +36,7 @@ $pgtitle = array(gettext("Services"),
                  gettext("RSYNCD"),
                  gettext("Server"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/services_rsyncd_client.php b/packages/freenas/www/services_rsyncd_client.php
index f5e86e07..ab54f562 100644
--- a/packages/freenas/www/services_rsyncd_client.php
+++ b/packages/freenas/www/services_rsyncd_client.php
@@ -36,6 +36,7 @@ $pgtitle = array(gettext("Services"),
                  gettext("RSYNCD"),
                  gettext("Client"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
diff --git a/packages/freenas/www/services_samba.php b/packages/freenas/www/services_samba.php
index 1703b645..9486f8fc 100644
--- a/packages/freenas/www/services_samba.php
+++ b/packages/freenas/www/services_samba.php
@@ -35,6 +35,7 @@
 $pgtitle = array(gettext("Services"),
                  gettext("CIFS"));
 
+require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");