* synced freenas package to current FreeNAS trunk

* unison package file needs to be added to pfsense.com
* rc script needs to be tested

1 files changed, 52 insertions, 41 deletions

diff --git a/packages/freenas/www/disks_raid_gmirror_infos.php b/packages/freenas/www/disks_raid_gmirror_infos.php
index 5fb2d1e1..878f571e 100644
--- a/packages/freenas/www/disks_raid_gmirror_infos.php
+++ b/packages/freenas/www/disks_raid_gmirror_infos.php
@@ -1,36 +1,44 @@
 <?php
 /* $Id$ */
+/* ========================================================================== */
 /*
-	disks_manage_edit.php
-	part of FreeNAS (http://www.freenas.org)
-	Copyright (C) 2005-2006 Olivier Cochard-Labbé <olivier@freenas.org>.
-	All rights reserved.
-	
-	Based on m0n0wall (http://m0n0.ch/wall)
-	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-	
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-	
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-	
-	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
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
-*/
+    disks_raid_gmirror_infos.php
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2006 Daniel S. Haischt <me@daniel.stefan.haischt.name>
+    All rights reserved.
+
+    Based on FreeNAS (http://www.freenas.org)
+    Copyright (C) 2005-2006 Olivier Cochard-Labbé <olivier@freenas.org>.
+    All rights reserved.
+
+    Based on m0n0wall (http://m0n0.ch/wall)
+    Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     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
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
 
 $pgtitle = array(gettext("System"),
                  gettext("Disks"),
@@ -81,22 +89,25 @@ echo $pfSenseHead->getHTML();
   <tr>
     <td class="tabnavtbl">
 <?php
-	$tab_array = array();
-	$tab_array[0] = array(gettext("Geom Mirror"),           true,  "disks_raid_gmirror.php");
-	$tab_array[1] = array(gettext("Geom Vinum (unstable)"), false, "disks_raid_gvinum.php");
-	display_top_tabs($tab_array);
+  $tab_array = array();
+  $tab_array[0] = array(gettext("Geom Mirror"), true,  "disks_raid_gmirror.php");
+  $tab_array[1] = array(gettext("Geom Concat"), false, "disks_raid_gconcat.php");
+  $tab_array[2] = array(gettext("Geom Stripe"), false, "disks_raid_gstripe.php");
+  $tab_array[3] = array(gettext("Geom RAID5"),  false, "disks_raid_graid5.php");
+  $tab_array[4] = array(gettext("Geom Vinum"),  false, "disks_raid_gvinum.php");
+  display_top_tabs($tab_array);
 ?>  
     </td>
   </tr>
   <tr>
     <td class="tabnavtbl">
 <?php
-	$tab_array = array();
-	$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);
+  $tab_array = array();
+  $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[1] = array(gettext("Tools"),       false, "disks_raid_gmirror_tools.php");
+  $tab_array[2] = array(gettext("Information"), true, "disks_raid_gmirror_infos.php");
+  display_top_tabs($tab_array);
 ?>  
     </td>
   </tr>
@@ -125,7 +136,7 @@ echo $pfSenseHead->getHTML();
       </form>
       </div>
     </td>
-	</tr>
+  </tr>
 </table>
 <?php include("fend.inc"); ?>
 </body>