From d53f1802ec57d800519401976c107428fa0b1e5f Mon Sep 17 00:00:00 2001 From: fling Date: Tue, 9 Nov 2010 13:34:25 +0800 Subject: [PATCH] modified: ri_oper.py modified: ri_tk_cmd.py add kernel argument vga=791 del "/" and "/boot" mount point is a Raid device. --- interface/ri_oper.py | 5 ++--- interface/ri_tk_cmd.py | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/interface/ri_oper.py b/interface/ri_oper.py index 70aa170..c1e01fc 100644 --- a/interface/ri_oper.py +++ b/interface/ri_oper.py @@ -319,14 +319,13 @@ class ConfigureBootloader(Operation): string = fd.read() list = string.split('-') fd.close() + + bootloader=['-t',tp,'-o',list[0][5:].split('.')[0]+'.'+list[0][5:].split('.')[1],'-k','vga=791 linx_serial=%s' %ri_data.SerialNumber.value.strip()] - bootloader=['-t',tp,'-o',list[0][5:].split('.')[0]+'.'+list[0][5:].split('.')[1]] for k in Mount.dict.keys(): if '/' == Mount.dict[k]: bootloader += ['-r',k] if '/boot' == Mount.dict[k]: bootloader += ['-b',k] - if ri_data.SerialNumber.value: - bootloader+=['-k',"linx_serial=%s" %ri_data.SerialNumber.value] return bootloader diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index 125eb57..f809a1a 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -97,9 +97,6 @@ def mp_top_ok(): elif dr in ['/','/boot'] and fs in ['reiserfs','xfs']: isspecial_dir = True dr = ri_data.MountPoint.dict[dev].directory - elif dr == '/' and dev[:2] == 'md' and not ri_data.MountPoint.dict.has_key('/boot'): - isspecial_dir = True - dr = ri_data.MountPoint.dict[dev].directory s2 = dev.ljust(10) + dr.ljust(10) + fs.ljust(10) + fm.ljust(4) + sz.ljust(6) + ri_data.Partition.unit l.append(s2)