From 1f3216863cf61d023e0e3023e2eecea23ecd180e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 22 Feb 2011 16:58:18 +0800 Subject: [PATCH] forth step ,change default language to chinese --- interface/ri_data.py | 3 +++ interface/ri_oper.py | 13 +++++++------ main/setup | 2 +- xml/interface.xml | 2 ++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/interface/ri_data.py b/interface/ri_data.py index ac7e88c..3dd05d9 100644 --- a/interface/ri_data.py +++ b/interface/ri_data.py @@ -2,6 +2,7 @@ import re import commands +import ri_oper from xml.dom import minidom from xml.dom.ext import PrettyPrint @@ -420,6 +421,8 @@ p_node - xml node (parent node)''' return False elif dr in ['/','/boot'] and fs in ['reiserfs','xfs']: return False + elif dr in ['/boot'] and ri_oper.Operation.getarch() == "ia64" and fs not in ['vfat']: + return False return True diff --git a/interface/ri_oper.py b/interface/ri_oper.py index 81cfe75..b676220 100644 --- a/interface/ri_oper.py +++ b/interface/ri_oper.py @@ -98,12 +98,7 @@ class Operation: if display_scale: display_scale() return ret - def getarch(self): - cmd='uname -m' - result = subprocess.Popen(cmd,stdout=subprocess.PIPE,shell=True) - arch = result.stdout.readline().rstrip() - return arch - + def sigpipe_handle(self): signal.signal(signal.SIGPIPE,signal.SIG_DFL) @@ -111,6 +106,12 @@ class Operation: return [] def get_stdin(self): return '' + @staticmethod + def getarch(): + cmd='uname -m' + result = subprocess.Popen(cmd,stdout=subprocess.PIPE,shell=True) + arch = result.stdout.readline().rstrip() + return arch class Format(Operation): ''' class for format partition ''' diff --git a/main/setup b/main/setup index b23456e..b7d0a3e 100755 --- a/main/setup +++ b/main/setup @@ -48,7 +48,7 @@ config_execfile(){ main(){ local style='graph' - local language='english' + local language='chinese' local xstart='yes' tmp=$(getopt -o s:l:nh --long style:,language:,noXserver,help -- "$@") diff --git a/xml/interface.xml b/xml/interface.xml index ac14ebd..34492e1 100644 --- a/xml/interface.xml +++ b/xml/interface.xml @@ -941,6 +941,7 @@ row 4 | | Note: 1、some of mount point is not hanging out, E.g: /etc、/bin、/sbin、/lib. 2、some of mount point is not mounting on reiserfs and xfs filesystem, E.g: /, /boot 3、when "/" hanging on Raid device, "/boot" must be hang out. + 4、If the processor is Series of Itanium, "/boot" must be hang out ,which required to turn into format of vfat . 设置挂载点显示框中分为五列,第一列是硬盘分区,如sdaX、mdX。第二列是挂载点,是挂载硬盘分区时所在的目录。第三列是硬盘分区的文件系统类型。第四列是指是否要格式化该硬盘分区,no表示不格式化,yes表示要格式化。第五列是各硬盘分区或raid设备的大小。 @@ -948,6 +949,7 @@ row 4 | | 注意:1、有些挂载点不能单挂出去,例如:/etc,/bin,/sbin,/lib。 2、有些挂载点不能挂载reiserfs、xfs文件系统,例如:/,/boot。 3、当"/"挂载在raid设备时,"/boot"挂载点必须单挂出来。 + 4、当处理器为安藤系列时,"/boot"挂载点必须单挂出来,且格式化为vfat格式。