Revision: 9540
http://freenas.svn.sourceforge.net/freenas/?rev=9540&view=rev
Author: daoyama
Date: 2012-01-15 01:22:50 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
delete useless code.
make cosmetic change.
add overwrite mode.
Modified Paths:
--------------
legacy/www/disks_zfs_config_sync.php
legacy/www/disks_zfs_zpool_tools.php
legacy/www/disks_zfs_zpool_vdevice_edit.php
Modified: legacy/www/disks_zfs_config_sync.php
===================================================================
--- legacy/www/disks_zfs_config_sync.php 2012-01-14 23:47:24 UTC (rev 9539)
+++ legacy/www/disks_zfs_config_sync.php 2012-01-15 01:22:50 UTC (rev 9540)
@@ -388,7 +388,10 @@
'size' => $disk['size'],
'aalgo' => "none",
'ealgo' => $geli_info['ealgo'],
+ 'fstype' => 'zfs',
);
+ } else if ($index !== false && isset($_POST['import_disks_overwrite'])) {
+ $cfg['geli']['vdisk'][$index]['fstype'] = 'zfs';
}
}
}
Modified: legacy/www/disks_zfs_zpool_tools.php
===================================================================
--- legacy/www/disks_zfs_zpool_tools.php 2012-01-14 23:47:24 UTC (rev 9539)
+++ legacy/www/disks_zfs_zpool_tools.php 2012-01-15 01:22:50 UTC (rev 9540)
@@ -274,12 +274,11 @@
if (($index = array_search_ex($devicev, $a_disk, "devicespecialfile")) !== false) {
$tmp = $a_disk[$index];
$tmp['type'] = $type;
+ $tmp['name2'] = $tmp['name'];
+ if (($index = array_search_ex($devicev, $a_encrypteddisk, "devicespecialfile")) !== false) {
+ $tmp['name2'] = $tmp['name'].".eli";
+ }
$result[] = $tmp;
- } else if (($index = array_search_ex($devicev, $a_encrypteddisk, "devicespecialfile")) !== false) {
- $tmp = $a_encrypteddisk[$index];
- $tmp['type'] = $type;
- $tmp['name'] = $tmp['name'].".eli";
- $result[] = $tmp;
}
}
}
@@ -303,10 +302,10 @@
?>
if (action != "cache add" && action != "cache remove") {
- div.innerHTML += "<input name='device[]' id='<?=$i?>' type='checkbox' value='<?=$disk['name'];?>'<?=$checked?> />";
+ div.innerHTML += "<input name='device[]' id='<?=$i?>' type='checkbox' value='<?=$disk['name2'];?>'<?=$checked?> />";
div.innerHTML += "<?=$disk['name'];?> (<?=$disk['size']?>, <?=htmlspecialchars($disk['desc'])?>)";
div.innerHTML += "<br />";
- document.iform.device_new[<?=$i;?>] = new Option('<?="{$disk['name']} ({$disk['size']}, {$disk['desc']})";?>','<?=$disk['name'];?>','false');
+ document.iform.device_new[<?=$i;?>] = new Option('<?="{$disk['name']} ({$disk['size']}, {$disk['desc']})";?>','<?=$disk['name2'];?>','false');
}
<?php
@@ -315,10 +314,10 @@
?>
if (action == "cache add" || action == "cache remove") {
- div.innerHTML += "<input name='device[]' id='<?=$i?>' type='checkbox' value='<?=$disk['name'];?>'<?=$checked?> />";
+ div.innerHTML += "<input name='device[]' id='<?=$i?>' type='checkbox' value='<?=$disk['name2'];?>'<?=$checked?> />";
div.innerHTML += "<?=$disk['name'];?> (<?=$disk['type']?>, <?=$disk['size']?>, <?=htmlspecialchars($disk['desc'])?>)";
div.innerHTML += "<br />";
- document.iform.device_new[<?=$j;?>] = new Option('<?="{$disk['name']} ({$disk['type']}, {$disk['size']}, {$disk['desc']})";?>','<?=$disk['name'];?>','false');
+ document.iform.device_new[<?=$j;?>] = new Option('<?="{$disk['name']} ({$disk['type']}, {$disk['size']}, {$disk['desc']})";?>','<?=$disk['name2'];?>','false');
}
<?php
@@ -583,17 +582,24 @@
case "offline": {
switch ($option) {
case "t":
- zfs_zpool_cmd($action, "-t {$pool} {$device}", true);
+ $result = zfs_zpool_cmd($action, "-t {$pool} {$device}", true);
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
case "d":
if (is_array($device)) {
+ $result = 0;
foreach ($device as $dev) {
- zfs_zpool_cmd($action, "{$pool} {$dev}", true);
+ $result |= zfs_zpool_cmd($action, "{$pool} {$dev}", true);
}
} else {
- zfs_zpool_cmd($action, "{$pool} {$device}", true);
+ $result = zfs_zpool_cmd($action, "{$pool} {$device}", true);
}
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
}
}
@@ -603,12 +609,16 @@
switch ($option) {
case "d":
if (is_array($device)) {
+ $result = 0;
foreach ($device as $dev) {
- zfs_zpool_cmd($action, "{$pool} {$dev}", true);
+ $result |= zfs_zpool_cmd($action, "{$pool} {$dev}", true);
}
} else {
- zfs_zpool_cmd($action, "{$pool} {$device}", true);
+ $result = zfs_zpool_cmd($action, "{$pool} {$device}", true);
}
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
}
}
@@ -618,12 +628,16 @@
switch ($option) {
case "d":
if (is_array($device)) {
+ $result = 0;
foreach ($device as $dev) {
- zfs_zpool_cmd($action, "{$pool} {$dev}", true);
+ $result |= zfs_zpool_cmd($action, "{$pool} {$dev}", true);
}
} else {
- zfs_zpool_cmd($action, "{$pool} {$device}", true);
+ $result = zfs_zpool_cmd($action, "{$pool} {$device}", true);
}
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
}
}
@@ -633,12 +647,16 @@
switch ($option) {
case "d":
if (is_array($device)) {
+ $result = 0;
foreach ($device as $dev) {
- zfs_zpool_cmd($action, "{$pool} {$dev}", true);
+ $result |= zfs_zpool_cmd($action, "{$pool} {$dev}", true);
}
} else if (!empty($device)) {
- zfs_zpool_cmd($action, "{$pool} {$device}", true);
+ $result = zfs_zpool_cmd($action, "{$pool} {$device}", true);
}
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
}
}
@@ -648,12 +666,16 @@
switch ($option) {
case "d":
if (is_array($device)) {
+ $result = 0;
foreach ($device as $dev) {
- zfs_zpool_cmd($action, "{$pool} {$dev} {$new_device}", true);
+ $result |= zfs_zpool_cmd($action, "{$pool} {$dev} {$new_device}", true);
}
} else {
- zfs_zpool_cmd($action, "{$pool} {$device} {$new_device}", true);
+ $result = zfs_zpool_cmd($action, "{$pool} {$device} {$new_device}", true);
}
+ if ($result == 0) {
+ echo gettext("Done.")."\n";
+ }
break;
}
}
Modified: legacy/www/disks_zfs_zpool_vdevice_edit.php
===================================================================
--- legacy/www/disks_zfs_zpool_vdevice_edit.php 2012-01-14 23:47:24 UTC (rev 9539)
+++ legacy/www/disks_zfs_zpool_vdevice_edit.php 2012-01-15 01:22:50 UTC (rev 9540)
@@ -51,7 +51,6 @@
$a_vdevice = &$config['zfs']['vdevices']['vdevice'];
$a_disk = get_conf_disks_filtered_ex("fstype", "zfs");
-$a_encrypteddisk = get_conf_encryped_disks_list();
if (!isset($uuid) && (!sizeof($a_disk)) && (!sizeof($a_encrypteddisk))) {
$errormsg = sprintf(gettext("No disks available. Please add new <a href='%s'>disk</a> first."), "disks_manage.php");
@@ -204,7 +203,6 @@
<?php html_inputbox("name", gettext("Name"), $pconfig['name'], "", true, 20, isset($uuid) && false !== $cnid);?>
<?php html_combobox("type", gettext("Type"), $pconfig['type'], array("stripe" => gettext("Stripe"), "mirror" => gettext("Mirror"), "raidz1" => gettext("Single-parity RAID-Z"), "raidz2" => gettext("Double-parity RAID-Z"), "raidz3" => gettext("Triple-parity RAID-Z"), "spare" => gettext("Hot Spare"), "cache" => gettext("Cache"), "log" => gettext("Log"), "log-mirror" => gettext("Log (mirror)")), "", true, isset($uuid) && false !== $cnid);?>
<?php $a_device = array(); foreach ($a_disk as $diskv) { if (isset($uuid) && false !== $cnid && !(is_array($pconfig['device']) && in_array($diskv['devicespecialfile'], $pconfig['device']))) { continue; } if ((!isset($uuid) || isset($uuid) && false === $cnid) && false !== array_search_ex($diskv['devicespecialfile'], $a_vdevice, "device")) { continue; } $a_device[$diskv['devicespecialfile']] = htmlspecialchars("{$diskv['name']} ({$diskv['size']}, {$diskv['desc']})"); }?>
- <?php foreach ($a_encrypteddisk as $diskv) { if (isset($uuid) && false !== $cnid && !(is_array($pconfig['device']) && in_array($diskv['devicespecialfile'], $pconfig['device']))) { continue; } if ((!isset($uuid) || isset($uuid) && false === $cnid) && false !== array_search_ex($diskv['devicespecialfile'], $a_vdevice, "device")) { continue; } $a_device[$diskv['devicespecialfile']] = htmlspecialchars("{$diskv['name']} ({$diskv['size']}, {$diskv['desc']})"); }?>
<?php html_listbox("device", gettext("Devices"), $pconfig['device'], $a_device, "", true, isset($uuid) && false !== $cnid);?>
<?php html_checkbox("aft4k", gettext("Advanced Format"), $pconfig['aft4k'] ? true : false, gettext("Enable Advanced Format (4KB sector)"), "", false, "");?>
<?php html_inputbox("desc", gettext("Description"), $pconfig['desc'], gettext("You may enter a description here for your reference."), false, 40);?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
