Merge branch 'bqin'

This commit is contained in:
Peng Zhihui
2013-12-27 09:49:34 +08:00

View File

@@ -75,28 +75,28 @@ class Partition:
''' disk partition '''
unit = ''
dict = makehash()
''' Partition init function '''
''' Partition init function '''
def __init__(self, dev, ds, pt, dfm, sn, partition, num, st, se, sz, tp, fs, fg, fr, fm, mp):
'''special process linux-swap(v1) use linux-swap for instead '''
if fs.startswith('linux-swap'):
fs = 'linux-swap'
self.dict[dev][dev] = dev
self.dict[dev]['disk_size'] = ds
self.dict[dev]['partition_table'] = pt
''' if modify parittion table this flag is no '''
self.dict[dev]['from_os'] = dfm
self.dict[dev]['partition'][partition]['sn']= sn
self.dict[dev]['partition'][partition]['num']= num
self.dict[dev]['partition'][partition]['start'] = st
self.dict[dev]['partition'][partition]['end'] = se
self.dict[dev]['partition'][partition]['size'] = sz
self.dict[dev]['partition'][partition]['type'] = tp
self.dict[dev]['partition'][partition]['filesystem'] = fs
self.dict[dev]['partition'][partition]['flags'] = fg
self.dict[dev]['partition'][partition]['from_os'] = fr
self.dict[dev]['partition'][partition]['format'] = fm
self.dict[dev]['partition'][partition]['mount_point'] = mp
self.dict[dev][dev] = dev
self.dict[dev]['disk_size'] = ds
self.dict[dev]['partition_table'] = pt
''' if modify parittion table this flag is no '''
self.dict[dev]['from_os'] = dfm
self.dict[dev]['partition'][partition]['sn']= sn
self.dict[dev]['partition'][partition]['num']= num
self.dict[dev]['partition'][partition]['start'] = st
self.dict[dev]['partition'][partition]['end'] = se
self.dict[dev]['partition'][partition]['size'] = sz
self.dict[dev]['partition'][partition]['type'] = tp
self.dict[dev]['partition'][partition]['filesystem'] = fs
self.dict[dev]['partition'][partition]['flags'] = fg
self.dict[dev]['partition'][partition]['from_os'] = fr
self.dict[dev]['partition'][partition]['format'] = fm
self.dict[dev]['partition'][partition]['mount_point'] = mp
@staticmethod
def get_disks():