/[gli]/trunk/src/GLIStorageDevice.py
Gentoo

Diff of /trunk/src/GLIStorageDevice.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 207 Revision 313
10 _total_sectors = 0 10 _total_sectors = 0
11 _cylinder_bytes = 0 11 _cylinder_bytes = 0
12 _sectors_in_cylinder = 0 12 _sectors_in_cylinder = 0
13 _parted_dev = None 13 _parted_dev = None
14 _parted_disk = None 14 _parted_disk = None
15 _fdiskcall = "fdisk -l " 15 _sector_bytes = 0
16 16
17 def __init__(self, device): 17 def __init__(self, device):
18 self._device = device 18 self._device = device
19 self._partitions = {} 19 self._partitions = {}
20 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512} 20 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512}
35# cylinders = int(total_sectors) / (int(heads) * int(sectors)) 35# cylinders = int(total_sectors) / (int(heads) * int(sectors))
36# self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = int(heads), int(sectors), int(cylinders) 36# self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = int(heads), int(sectors), int(cylinders)
37# else: #SCSI 37# else: #SCSI
38 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders 38 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders
39 39
40 self._sector_bytes = self._parted_dev.sector_size
40 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._parted_dev.sector_size 41 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes
41 self._total_sectors = self._geometry['cylinders'] * self._geometry['heads'] * self._geometry['sectors'] 42# self._total_sectors = self._geometry['cylinders'] * self._geometry['heads'] * self._geometry['sectors']
43 self._total_sectors = self._parted_dev.length
42 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors'] 44 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors']
43 45
44 def set_partitions_from_disk(self): 46 def set_partitions_from_disk(self):
45 parted_part = self._parted_disk.next_partition() 47 parted_part = self._parted_disk.next_partition()
46 while parted_part != None: 48 while parted_part != None:
72 return self._device 74 return self._device
73 75
74 def clear_partitions(self): 76 def clear_partitions(self):
75 self._partitions = {} 77 self._partitions = {}
76 78
77 def add_partition(self, minor, start, end, type): 79 def add_partition(self, minor, start, end, type, mountpoint='', mountopts=''):
78 free_start, free_end = self.get_free_space(start) 80 free_start, free_end = self.get_free_space(start)
79 minor = int(minor) 81 minor = int(minor)
80 if not free_end: 82 if not free_end:
81 return False 83 return False
82 if self._partitions.has_key(minor): 84 if self._partitions.has_key(minor):
95 if (i >= hole_at) and (hole_at): continue 97 if (i >= hole_at) and (hole_at): continue
96 if i >= minor: 98 if i >= minor:
97 self._partitions[i].set_minor(i+1) 99 self._partitions[i].set_minor(i+1)
98 self._partitions[i+1] = self._partitions[i] 100 self._partitions[i+1] = self._partitions[i]
99 if i == minor: stopscooting = 1 101 if i == minor: stopscooting = 1
100 self._partitions[minor] = Partition(self, minor, '', start, end, 0, type) 102 self._partitions[minor] = Partition(self, minor, '', start, end, 0, type, mountpoint=mountpoint, mountopts=mountopts)
101 103
102 def remove_partition(self, minor): 104 def remove_partition(self, minor):
103 del self._partitions[int(minor)] 105 del self._partitions[int(minor)]
104 106
105 def get_free_space(self, start): 107 def get_free_space(self, start):
211 213
212 def get_install_profile_structure(self): 214 def get_install_profile_structure(self):
213 devdic = {} 215 devdic = {}
214 for part in self._partitions: 216 for part in self._partitions:
215 tmppart = self._partitions[part] 217 tmppart = self._partitions[part]
216 devdic[part] = { 'mb': 0, 'start': tmppart.get_start(), 'end': tmppart.get_end(), 'type': tmppart.get_type(), 'mountpoint': tmppart.get_mountpoint(), 'mountopts': tmppart.get_mountopts(), 'format': tmppart.get_format() } 218 devdic[part] = { 'mb': 0, 'minor': int(part), 'start': tmppart.get_start(), 'end': tmppart.get_end(), 'type': tmppart.get_type(), 'mountpoint': tmppart.get_mountpoint(), 'mountopts': tmppart.get_mountopts(), 'format': tmppart.get_format() }
217 return devdic 219 return devdic
218 220
219 def get_extended_partition(self): 221 def get_extended_partition(self):
220 for part in self._partitions: 222 for part in self._partitions:
221 tmppart = self._partitions[part] 223 tmppart = self._partitions[part]
226 def get_num_sectors(self): 228 def get_num_sectors(self):
227 return int(self._total_sectors) 229 return int(self._total_sectors)
228 230
229 def get_cylinder_size(self): 231 def get_cylinder_size(self):
230 return int(self._cylinder_bytes) 232 return int(self._cylinder_bytes)
233
234 def get_sector_size(self):
235 return int(self._sector_bytes)
231 236
232 def get_num_cylinders(self): 237 def get_num_cylinders(self):
233 return int(self._geometry['cylinders']) 238 return int(self._geometry['cylinders'])
234 239
235 def get_drive_bytes(self): 240 def get_drive_bytes(self):
301 self._mountpoint = mountpoint 306 self._mountpoint = mountpoint
302 self._mountopts = mountopts 307 self._mountopts = mountopts
303 self._format = format 308 self._format = format
304 if blocks == 0: 309 if blocks == 0:
305 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512 310 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512
306# if existing: 311 if existing:
307# parted_part = device._parted_disk.get_partition(minor) 312 parted_part = device._parted_disk.get_partition(minor)
308# if type == "ntfs": 313 if type == "ntfs":
309# min_bytes = int(commands.getoutput("ntfsresize -f --info " + device._device + str(minor) + " | grep -e '^You might resize' | sed -e 's/You might resize at //' -e 's/ bytes or .\+//'")) 314 min_bytes = int(commands.getoutput("ntfsresize -f --info " + device._device + str(minor) + " | grep -e '^You might resize' | sed -e 's/You might resize at //' -e 's/ bytes or .\+//'"))
310# self._min_cylinders_for_resize = int(min_bytes / self._device._cylinder_bytes) + 1 315 self._min_cylinders_for_resize = int(min_bytes / self._device._cylinder_bytes) + 1
311# self._resizeable == True 316 self._resizeable == True
312# elif type == "ext2" or type == "ext3": 317 elif type == "ext2" or type == "ext3":
313# block_size = string.strip(commands.getoutput("dumpe2fs -h " + device._device + str(minor) + " 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'")) 318 block_size = string.strip(commands.getoutput("dumpe2fs -h " + device._device + str(minor) + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'"))
314# free_blocks = string.strip(commands.getoutput("dumpe2fs -h " + device._device + str(minor) + " 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'")) 319 free_blocks = string.strip(commands.getoutput("dumpe2fs -h " + device._device + str(minor) + r" 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'"))
315# free_cyl = int(int(block_size) * int(free_blocks) / self._device._cylinder_bytes) 320 free_sec = int(int(block_size) * int(free_blocks) / self._device._sector_bytes)
316# free_cyl = int(free_cyl)
317# free_cyl = free_cyl - 200 # just to be safe 321 free_sec = free_sec - 2000 # just to be safe
318# self._min_cylinders_for_resize = (self._end - self._start + 1) - free_cyl 322 self._min_sectors_for_resize = (self._end - self._start + 1) - free_sec
319# self._resizeable == True 323 self._resizeable == True
320# elif type == "fat16" or type == "fat32": 324 else:
321# parted_part = self._device._parted_disk.get_partition(self._minor) 325 parted_part = self._device._parted_disk.get_partition(self._minor)
326 try:
322# parted_fs = parted_part.geom.file_system_open() 327 parted_fs = parted_part.geom.file_system_open()
328 except:
329 self._resizeable = False
330 return
323# resize_constraint = parted_fs.get_resize_constraint() 331 resize_constraint = parted_fs.get_resize_constraint()
324# min_size = float(resize_constraint.min_size / self._device._sectors_in_cylinder) 332 min_size = resize_constraint.min_size
325# if int(min_size) != min_size: min_size = int(min_size) + 1 333 if int(min_size) != min_size: min_size = int(min_size) + 1
326# self._min_cylinders_for_resize = min_size 334 self._min_sectors_for_resize = min_size
327# self._resizeable = True 335 self._resizeable = True
328# elif type == "":
329# self._min_cylinders_for_resize = 1
330# self._resizeable = True
331# else:
332# self._resizeable = True
333 336
334 def is_extended(self): 337 def is_extended(self):
335 if self._type == "extended": 338 if self._type == "extended":
336 return True 339 return True
337 else: 340 else:
346 def get_logicals(self): 349 def get_logicals(self):
347 if not self.is_extended(): 350 if not self.is_extended():
348 return None 351 return None
349 logicals = [] 352 logicals = []
350 start = self._start 353 start = self._start
351# while not start > self._end:
352# part = self._device.get_partition_at(start)
353# print "part=" + str(part)
354# if not part: break
355# logicals.append(part)
356# start = self._device._partitions[part].get_end() + 1
357 parts = self._device._partitions.keys() 354 parts = self._device._partitions.keys()
358 parts.sort() 355 parts.sort()
359 for part in parts: 356 for part in parts:
360 if part < 5: continue 357 if part < 5: continue
361 logicals.append(part) 358 logicals.append(part)
421 def get_min_sectors_for_resize(self): 418 def get_min_sectors_for_resize(self):
422 if self.is_extended(): 419 if self.is_extended():
423 min_size = self._start 420 min_size = self._start
424 for part in self._device._partitions: 421 for part in self._device._partitions:
425 if part < 5: continue 422 if part < 5: continue
426 min_size = part.get_end() 423 if part.get_end > min_size: min_size = part.get_end()
427 return min_size 424 return min_size
428 else: 425 else:
429 return self._min_sectors_for_resize 426 return self._min_sectors_for_resize
430 427
431 def get_max_sectors_for_resize(self): 428 def get_max_sectors_for_resize(self):
432 free_start, free_end = self._device.get_free_space(self._end) 429 free_start, free_end = self._device.get_free_space(self._end)
433 if free_end == -1: return self._end 430 if free_end == -1: return self._end
434 if free_start - 1 == self._end: 431 if free_start - 1 == self._end:
435 if self.is_logical(): 432 if self.is_logical():
436 if free_end <= self._device._partitions[self.get_extended_parent()]._end: 433 if free_end <= self._device._partitions[self.get_extended_parent()]._end:
437 return free_end 434 return free_end - self._start
438 else: 435 else:
439 return self._end 436 return self._end - self._start
440 else: 437 else:
441 return free_end 438 return free_end - self._start
442 439
443 def resize(self, start, end): 440 def resize(self, start, end):
444 part_at_start = self._device.get_partition_at(int(start)) 441 part_at_start = self._device.get_partition_at(int(start))
445 part_at_end = self._device.get_partition_at(int(end)) 442 part_at_end = self._device.get_partition_at(int(end))
446 logicals = None 443 logicals = None

Legend:
Removed from v.207  
changed lines
  Added in v.313

  ViewVC Help
Powered by ViewVC 1.1.20