* 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, 138 insertions, 129 deletions

diff --git a/packages/freenas/www/disks_raid_gmirror_edit.php b/packages/freenas/www/disks_raid_gmirror_edit.php
index b67d90d2..ac08a442 100644
--- a/packages/freenas/www/disks_raid_gmirror_edit.php
+++ b/packages/freenas/www/disks_raid_gmirror_edit.php
@@ -1,71 +1,80 @@
 <?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_edit.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"),
                  gettext("GEOM Mirror"),
                  gettext("RAID"),
-                 gettext("Edit"));
+                 isset($id) ? gettext("Edit") : gettext("Add"));
 
 require_once("freenas_config.inc");
 require_once("guiconfig.inc");
 require_once("freenas_guiconfig.inc");
 require_once("freenas_functions.inc");
 
+$id = $_GET['id'];
+if (isset($_POST['id']))
+  $id = $_POST['id'];
+
 if (!is_array($freenas_config['gmirror']['vdisk']))
-	$freenas_config['gmirror']['vdisk'] = array();
+  $freenas_config['gmirror']['vdisk'] = array();
 
 gmirror_sort();
-
-if (!is_array($freenas_config['disks']['disk']))
-	$nodisk_errors[] = _DISKSRAIDEDITPHP_MSGADDDISKFIRST;
-else
-	disks_sort();
+disks_sort();
 
 $a_raid = &$freenas_config['gmirror']['vdisk'];
+$all_raid = array_merge((array)$freenas_config['graid5']['vdisk'],(array)$freenas_config['gmirror']['vdisk'],(array)$freenas_config['gvinum']['vdisk'],(array)$freenas_config['gstripe']['vdisk'],(array)$freenas_config['gconcat']['vdisk']);
+$a_disk = get_fstype_disks_list("softraid");
 
-$a_disk = &$freenas_config['disks']['disk'];
+if (!sizeof($a_disk)) {
+  $nodisk_errors[] = gettext("You must add disks first.");
+}
 
-$id = $_GET['id'];
-if (isset($_POST['id']))
-	$id = $_POST['id'];
-  
 if (isset($id) && $a_raid[$id]) {
-	$pconfig['name'] = $a_raid[$id]['name'];
-	$pconfig['type'] = $a_raid[$id]['type'];
-	$pconfig['balance'] = $a_raid[$id]['balance'];
-	$pconfig['diskr'] = $a_raid[$id]['diskr'];
+  $pconfig['name'] = $a_raid[$id]['name'];
+  $pconfig['fullname'] = $a_raid[$id]['fullname'];
+  $pconfig['type'] = $a_raid[$id]['type'];
+  $pconfig['balance'] = $a_raid[$id]['balance'];
+  $pconfig['diskr'] = $a_raid[$id]['diskr'];
 }
 
 if (! empty($_POST))
@@ -74,36 +83,36 @@ if (! empty($_POST))
   unset($error_bucket);
   /* simple error list */
   unset($input_errors);
-
-	$reqdfields = explode(" ", "name");
-	$reqdfieldsn = explode(",", "Name");
-	
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
   
-	if (($_POST['name'] && !is_validaliasname($_POST['name'])))
-	{
+  $reqdfields = explode(" ", "name");
+  $reqdfieldsn = explode(",", "Name");
+  
+  do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+  
+  if (($_POST['name'] && !is_validaliasname($_POST['name'])))
+  {
     $error_bucket[] = array("error" => gettext("The device name may only consist of the characters a-z, A-Z, 0-9."),
                             "field" => "name");
-	}
-	
-		
-	/* check for name conflicts */
-	foreach ($a_raid as $raid)
-	{
-		if (isset($id) && ($a_raid[$id]) && ($a_raid[$id] === $raid))
-			continue;
-
-		if ($raid['name'] == $_POST['name'])
-		{
+  }
+  
+    
+  /* check for name conflicts */
+  foreach ($a_raid as $raid)
+  {
+    if (isset($id) && ($a_raid[$id]) && ($a_raid[$id] === $raid))
+      continue;
+  
+    if ($raid['name'] == $_POST['name'])
+    {
       $error_bucket[] = array("error" => gettext("This device already exists in the raid volume list."),
                               "field" => "name");
-			break;
-		}
-	}
-	
-	/* check the number of RAID disk for volume */
-	
-	if (count($_POST['diskr']) != 2)
+      break;
+    }
+  }
+  
+  /* check the number of RAID disk for volume */
+  
+  if (count($_POST['diskr']) != 2)
     $error_bucket[] = array("error" => gettext("There must be 2 disks in a RAID 1 volume."),
                             "field" => "diskr");
   
@@ -117,32 +126,33 @@ if (! empty($_POST))
       exit;   
   }
   
-	if (!$input_errors) {
-		$raid = array();
-		$raid['name'] = $_POST['name'];
-		$raid['balance'] = $_POST['balance'];
-		$raid['type'] = 1;
-		$raid['diskr'] = $_POST['diskr'];
-		$raid['desc'] = "Software RAID {$_POST['type']}";
-		
-		if (isset($id) && $a_raid[$id])
-			$a_raid[$id] = $raid;
-		else
-			$a_raid[] = $raid;
-		
-         	$fd = @fopen("$d_raidconfdirty_path", "a");
-         	if (!$fd) {
-         		echo "ERR Could not save RAID configuration.\n";
-         		exit(0);
-         	}
-         	fwrite($fd, "$raid[name]\n");
-         	fclose($fd);
-		
-		write_config();
-		
-		pfSenseHeader("disks_raid_gmirror.php");
-		exit;
-	}
+  if (!$input_errors) {
+    $raid = array();
+    $raid['name'] = $_POST['name'];
+    $raid['balance'] = $_POST['balance'];
+    $raid['type'] = 1;
+    $raid['diskr'] = $_POST['diskr'];
+    $raid['desc'] = "Software RAID {$_POST['type']}";
+    $raid['fullname'] = "/dev/mirror/{$raid['name']}";
+    
+    if (isset($id) && $a_raid[$id])
+      $a_raid[$id] = $raid;
+    else
+      $a_raid[] = $raid;
+    
+    $fd = @fopen("$d_raidconfdirty_path", "a");
+    if (!$fd) {
+      echo "ERR Could not save RAID configuration.\n";
+      exit(0);
+    }
+    fwrite($fd, "$raid[name]\n");
+    fclose($fd);
+    
+    write_config();
+    
+    pfSenseHeader("disks_raid_gmirror.php");
+    exit;
+  }
 }
 
 include("head.inc");
@@ -162,22 +172,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"), true,  "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"), false, "disks_raid_gmirror_infos.php");
-	display_top_tabs($tab_array);
+  $tab_array = array();
+  $tab_array[0] = array(gettext("Manage RAID"), true,  "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"), false, "disks_raid_gmirror_infos.php");
+  display_top_tabs($tab_array);
 ?>  
     </td>
   </tr>
@@ -187,7 +200,7 @@ echo $pfSenseHead->getHTML();
       <form action="disks_raid_gmirror_edit.php" method="post" name="iform" id="iform">
       <table class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
       <tr>
-        <td width="22%" valign="top" class="vncellreq"><?=gettext("Volume name");?></td>
+        <td width="22%" valign="top" class="vncellreq"><?=gettext("Raid name");?></td>
         <td width="78%" class="vtable">
           <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>" />
         </td>
@@ -202,14 +215,14 @@ echo $pfSenseHead->getHTML();
         <td width="22%" valign="top" class="vncellreq"><?= gettext("Balance algorithm"); ?></td>
         <td width="78%" class="vtable"> 
           <select name="balance" class="formselect">
-					  <?php $balvals = array(
-                               "split"=>"Split request",
-                               "load"=>"Read from lowest load",
-                               "round-robin"=>"Round-robin read");
-            ?>
-					  <?php foreach ($balvals as $balval => $balname): ?>
-            <option value="<?=$balval;?>" <?php if($pconfig['balance'] == $balval) echo 'selected';?>><?=htmlspecialchars($balname);?></option>
-					  <?php endforeach; ?>
+          <?php $balvals = array(
+                             "split"=>"Split request",
+                             "load"=>"Read from lowest load",
+                             "round-robin"=>"Round-robin read");
+          ?>
+          <?php foreach ($balvals as $balval => $balname): ?>
+          <option value="<?=$balval;?>" <?php if($pconfig['balance'] == $balval) echo 'selected';?>><?=htmlspecialchars($balname);?></option>
+          <?php endforeach; ?>
           </select>
           <br />
           <?= gettext("Select your read balance algorithm."); ?></td>
@@ -224,21 +237,17 @@ echo $pfSenseHead->getHTML();
               foreach ($a_disk as $diskv) {
                 $r_name="";
                
-                if (strcmp($diskv['fstype'],"gmirror")==0) {
-                  foreach($a_raid as $raid) {
-                    if (in_array($diskv['name'],$raid['diskr'])) {
-                      $r_name=$raid['name'];
-                     
-                      if ($r_name!=$pconfig['name'])
-                        $disable_script.="document.getElementById($i).disabled=1;\n";
-                      break;
-                    }
+                foreach($all_raid as $raid) {
+                  if (in_array($diskv['fullname'],(array)$raid['diskr'])) {
+                    $r_name=$raid['name'];
+                    if ($r_name!=$pconfig['name']) $disable_script.="document.getElementById($i).disabled=1;\n";
+                    break;
                   }
-                
-                  echo "<input name='diskr[]' id='$i' type='checkbox' value='$diskv[name]'".
-                       ((is_array($pconfig['diskr']) && in_array($diskv['name'], $pconfig['diskr'])) ? " checked=\"checked\"":"").
-                       " />$diskv[name] ($diskv[size], $diskv[desc])" . (($r_name) ? " - assigned to $r_name" : "") . "<br />\n";
                 }
+                echo "<input name='diskr[]' id='$i' type='checkbox' value='$diskv[fullname]'".
+                     ((is_array($pconfig['diskr']) && in_array($diskv['fullname'],$pconfig['diskr'])) ? " checked=\"checked\"" : "") .
+                     " />$diskv[name] ($diskv[size], $diskv[desc])".(($r_name) ? " - assigned to $r_name" : "")."<br />\n";
+                $i++;
                 
                 $i++;
               }