From e4459f776b900efdc96710b9fa35a1f482b41da2 Mon Sep 17 00:00:00 2001 From: fling Date: Mon, 11 Oct 2010 15:32:37 +0800 Subject: [PATCH] modified: ri_tk_cmd.py fix a raid size on mountpoint display --- interface/ri_tk_cmd.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index 27a67d2..0920b20 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -313,16 +313,20 @@ level - raid level (0/1/5) devs - raid component devices ''' # all devs shall have same size. + unit=ri_data.Partition.unit + sz=99999999999 for p in ri_data.Partition.list: - if p.device == devs[0]: - sz = p.size - break + if p.device in devs: + if float(p.size[:-len(unit)])< float(sz): + sz = float(p.size[:-len(unit)]) if level == '0': - return len(devs)*sz + sz=sz*len(devs) + return "%d%s"%(sz,unit) elif level == '1': - return sz + return "%d%s"%(sz,unit) elif level == '5': - return sz*(len(devs)-1) + sz=sz*(len(devs)-1) + return "%d%s"%(sz,unit) def raid_device_add(): ''' add a new raid device '''