bug 2017:修改安装程序,使6.0.42.41系统支持在fakeraid上安装

修改:      main/begin-install
	修改:      new_partition/interface_partition.py
	修改:      new_partition/parted_devices.py
	修改:      new_partition/partition_data.py
	修改:      operation/install_bootloader.sh
	修改:      text/get_instmode.sh

Signed-off-by: PengZhihui <zhihuipeng@linx-info.com>
This commit is contained in:
PengZhihui
2014-09-17 11:18:23 +08:00
parent 40be9d2cad
commit 911c08a72a
6 changed files with 51 additions and 13 deletions

View File

@@ -7,6 +7,8 @@ import partition_data as p_d
sys.path.append('../interface/')
import ri_data
import subprocess
global base_unit
base_unit = 's'
@@ -149,13 +151,18 @@ def showPartitionWindow():
if re.search('/dev/md/',dev):
continue
#process = subprocess.Popen('dmraid -r -c |tr "\n" " "' ,stdout=subprocess.PIPE, shell=True)
#if dev in process.stdout.readline().strip().split(" "):
# continue
clb.append(["%s" %(dev),"","","","",""], \
"dev:%s:%s" %(dev,dev_size), [LEFT, RIGHT, RIGHT, RIGHT, LEFT, LEFT])
if partition_table == '':
continue
if re.search('/cciss/', dev):
#if re.search('/cciss/', dev) or re.search('/mapper/', dev):
if dev[-1].isdigit():
pre_partition_name = dev + 'p'
else:
pre_partition_name = dev