diff options
author | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-11 11:03:31 +0000 |
---|---|---|
committer | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-01-11 11:03:31 +0000 |
commit | 40b0848cf0bc85ee5c85a75b1ae3a75494e8d09d (patch) | |
tree | 4a5059d75748ddbd7c5cff28e98b2a7e1d5cabc0 /packages/freenas/pkg/freenas_disks.inc | |
parent | 4c220daee80a863e20460950a2a49d29d5bc3075 (diff) | |
download | pfsense-packages-40b0848cf0bc85ee5c85a75b1ae3a75494e8d09d.tar.gz pfsense-packages-40b0848cf0bc85ee5c85a75b1ae3a75494e8d09d.tar.bz2 pfsense-packages-40b0848cf0bc85ee5c85a75b1ae3a75494e8d09d.zip |
* sync to latest FreeNAS trunk
Diffstat (limited to 'packages/freenas/pkg/freenas_disks.inc')
-rw-r--r-- | packages/freenas/pkg/freenas_disks.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/freenas/pkg/freenas_disks.inc b/packages/freenas/pkg/freenas_disks.inc index 3ccc4f24..16f5a12f 100644 --- a/packages/freenas/pkg/freenas_disks.inc +++ b/packages/freenas/pkg/freenas_disks.inc @@ -1034,6 +1034,9 @@ function disks_raid_graid5_delete($raidname) { // Stop the volume mwexec("/sbin/graid5 stop $raidname"); + + // The volume can disapear a few second after stop + sleep(2); // Clear the graid5 information on the hard drive foreach ($freenas_config['graid5']['vdisk'] as $a_raid) { @@ -1155,6 +1158,7 @@ function disks_bsdlabel($harddrive,$partition,$type) { // If the line contain the word "unused" if (ereg ("unused",$val)) { // Replacing c: by a: + // Why ??? Must found the web page where I see this method $val = ereg_replace ("c:","a:", $val); // Peplacing unused by $type $val = ereg_replace ("unused",$type, $val); @@ -1198,8 +1202,6 @@ function disks_set_ataidle() { $apm=$disk['apm']; $ac=$disk['acoustic']; - /* mwexec("/usr/local/sbin/ataidle -A $ac -P $apm -S $time $channel $device"); */ - $cmd = "/usr/local/sbin/ataidle "; if ($disk['acoustic'] != 0) { $cmd .= "-A $ac "; } @@ -1227,9 +1229,11 @@ Result is in the form: [type] => 0xa5 [flags] => 0x80 ) + +Called in disks_manage_tools.php */ function disks_get_partition_info($disk) { - exec("/sbin/fdisk -s /dev/{$disk}", $rawdata); + exec("/sbin/fdisk -s {$disk}", $rawdata); array_shift($rawdata); array_shift($rawdata); |