modified: ri_oper.py

modified:   ri_tk_cmd.py
    add kernel argument vga=791
    del "/" and "/boot" mount point is a Raid device.
This commit is contained in:
fling
2010-11-09 13:34:25 +08:00
parent e0bd0d506d
commit d53f1802ec
2 changed files with 2 additions and 6 deletions

View File

@@ -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

View File

@@ -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)