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

Diff of /trunk/src/GLIStorageDevice.py

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

Revision 386 Revision 625
1import commands, string, re, os, parted 1import commands, string, os, parted
2from GLIException import *
3import GLIUtility
2 4
5MEGABYTE = 1024 * 1024
6
7archinfo = { 'sparc': { 'fixedparts': [ { 'minor': 3, 'type': "wholedisk" } ], 'disklabel': 'sun', 'extended': False },
8 'hppa': { 'fixedparts': [ { 'minor': 1, 'type': "boot" } ], 'disklabel': 'msdos', 'extended': False },
9 'x86': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True },
10 'amd64': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True },
11 'ppc': { 'fixedparts': [ { 'minor': 1, 'type': "metadata" } ], 'disklabel': 'mac', 'extended': False }
12 }
13
14##
15# This class provides a partitioning abstraction for the frontends
3class Device: 16class Device:
4 "Class representing a partitionable device." 17 "Class representing a partitionable device."
5 18
6 _device = None 19 _device = None
7 _partitions = None 20 _partitions = None
11 _cylinder_bytes = 0 24 _cylinder_bytes = 0
12 _sectors_in_cylinder = 0 25 _sectors_in_cylinder = 0
13 _parted_dev = None 26 _parted_dev = None
14 _parted_disk = None 27 _parted_disk = None
15 _sector_bytes = 0 28 _sector_bytes = 0
16 29 _total_mb = 0
17 def __init__(self, device): 30 _arch = None
31 _disklabel = None
32
33 ##
34 # Initialization function for GLIStorageDevice class
35 # @param device Device node (e.g. /dev/hda) of device being represented
36 # @param arch="x86" Architecture that we're partition for (defaults to 'x86' for now)
37 def __init__(self, device, arch="x86", set_geometry=True):
18 self._device = device 38 self._device = device
19 self._partitions = {} 39 self._partitions = {}
20 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512} 40 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512}
21 self._total_bytes = 0 41 self._total_bytes = 0
22 self._cylinder_bytes = 0 42 self._cylinder_bytes = 0
43 self._arch = arch
23 self._parted_dev = parted.PedDevice.get(self._device) 44 self._parted_dev = parted.PedDevice.get(self._device)
45 try:
24 self._parted_disk = parted.PedDisk.new(self._parted_dev) 46 self._parted_disk = parted.PedDisk.new(self._parted_dev)
47 except:
48 self._parted_disk = self._parted_dev.disk_new_fresh(parted.disk_type_get(archinfo[self._arch]['disklabel']))
49 self._disklabel = self._parted_disk.type.name
50 if set_geometry:
25 self.set_disk_geometry_from_disk() 51 self.set_disk_geometry_from_disk()
26 52
53 ##
54 # Sets disk geometry info from disk. This function is used internally by __init__()
27 def set_disk_geometry_from_disk(self): 55 def set_disk_geometry_from_disk(self):
28 self._total_bytes = self._parted_dev.length * self._parted_dev.sector_size 56 self._total_bytes = self._parted_dev.length * self._parted_dev.sector_size
29# if string.strip(commands.getoutput("echo " + self._device + " | grep '/hd'")) == self._device: # IDE
30# proc_dir = "/proc/ide/" + commands.getoutput("echo " + self._device + " | cut -d '/' -f 3")
31# proc_dir = string.strip(proc_dir)
32# heads = commands.getoutput("cat " + proc_dir + "/geometry | grep logical | cut -d '/' -f 2")
33# sectors = commands.getoutput("cat " + proc_dir + "/geometry | grep logical | cut -d '/' -f 3")
34# total_sectors = commands.getoutput("cat " + proc_dir + "/capacity")
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)
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 57 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders
39
40 self._sector_bytes = self._parted_dev.sector_size 58 self._sector_bytes = self._parted_dev.sector_size
41 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes 59 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes
42# self._total_sectors = self._geometry['cylinders'] * self._geometry['heads'] * self._geometry['sectors']
43 self._total_sectors = self._parted_dev.length 60 self._total_sectors = self._parted_dev.length
44 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors'] 61 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors']
62 self._total_mb = int(self._total_bytes / MEGABYTE)
45 63
64 ##
65 # Sets partition info from disk.
46 def set_partitions_from_disk(self): 66 def set_partitions_from_disk(self):
67 last_part = 0
68 last_log_part = 4
47 parted_part = self._parted_disk.next_partition() 69 parted_part = self._parted_disk.next_partition()
48 while parted_part != None: 70 while parted_part:
71 part_mb = int((parted_part.geom.end - parted_part.geom.start + 1) * self._sector_bytes / MEGABYTE)
49 if parted_part.num < 1: 72 if parted_part.num >= 1:
50 parted_part = self._parted_disk.next_partition(parted_part)
51 continue
52 fs_type = "" 73 fs_type = ""
53 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name 74 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name
54 if parted_part.type == 2: fs_type = "extended" 75 if parted_part.type == 2: fs_type = "extended"
76 if archinfo[self._arch]['extended'] and parted_part.num > 4:
77 last_log_part = parted_part.num
78 else:
79 last_part = parted_part.num
55 self._partitions[int(parted_part.num)] = Partition(self, parted_part.num, '', parted_part.geom.start, parted_part.geom.end, (parted_part.geom.end - parted_part.geom.start), fs_type, format=False, existing=True) 80 self._partitions[int(parted_part.num)] = Partition(self, parted_part.num, part_mb, parted_part.geom.start, parted_part.geom.end, fs_type, format=False, existing=True)
81 elif parted_part.type_name == "free":
82 parent_part = self.get_partition_at(parted_part.geom.start, ignore_extended=0)
83 if parent_part:
84 self._partitions[last_log_part+0.9] = Partition(self, last_log_part+0.9, part_mb, parted_part.geom.start, parted_part.geom.end, "free", format=False, existing=False)
85 last_log_part += 1
86 else:
87 self._partitions[last_part+0.1] = Partition(self, last_part+0.1, part_mb, parted_part.geom.start, parted_part.geom.end, "free", format=False, existing=False)
88 last_part += 1
56 parted_part = self._parted_disk.next_partition(parted_part) 89 parted_part = self._parted_disk.next_partition(parted_part)
57 90
91 ##
92 # Imports partition info from the install profile partition structure (currently does nothing)
93 # @param ips Parameter structure returned from install_profile.get_partition_tables()
58 def set_partitions_from_install_profile_structure(self, ips): 94 def set_partitions_from_install_profile_structure(self, ips):
59 for part in ips: 95 for part in ips:
60 tmppart = ips[part] 96 tmppart = ips[part]
61 existing = False 97 existing = False
62 parted_part = self._parted_disk.get_partition(part) 98 if tmppart['origminor'] and not tmppart['format']:
63 if parted_part != None:
64 start = parted_part.geom.start / self._sectors_in_cylinder
65 end = parted_part.geom.end / self._sectors_in_cylinder
66 fs_type = ""
67 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name
68 if parted_part.type == 2: fs_type = "extended"
69 if int(tmppart['start']) == int(start) and int(tmppart['end']) == int(end) and tmppart['type'] == fs_type and tmppart['format'] == False:
70 existing = True 99 existing = True
71 self._partitions[int(part)] = Partition(self, part, '', tmppart['start'], tmppart['end'], 0, tmppart['type'], mountopts=tmppart['mountopts'], mountpoint=tmppart['mountpoint'], format=tmppart['format'], existing=(not tmppart['format'])) 100 self._partitions[tmppart['minor']] = Partition(self, tmppart['minor'], tmppart['mb'], tmppart['start'], tmppart['end'], tmppart['type'], format=tmppart['format'], origminor=tmppart['origminor'], existing=existing, mountpoint=tmppart['mountpoint'], mountopts=tmppart['mountopts'])
72 101
102 ##
103 # Returns name of device (e.g. /dev/hda) being represented
73 def get_device(self): 104 def get_device(self):
74 return self._device 105 return self._device
75 106
107 ##
108 # Combines free space and closes gaps in minor numbers. This is used internally
76 def clear_partitions(self): 109 def tidy_partitions(self):
77 self._partitions = {} 110 last_minor = 0
111 last_log_minor = 4
112 last_free = 0
113 last_log_free = 0
114 parts = self._partitions.keys()
115 parts.sort()
116 for part in parts:
117 if archinfo[self._arch]['extended'] and part > 4: break
118 tmppart = self._partitions[part]
119 if tmppart.get_type() == "extended":
120 for part_log in parts:
121 if part_log < 4.9: continue
122 tmppart_log = self._partitions[part_log]
123 if tmppart_log.get_type() == "free":
124 if last_log_minor < last_log_free:
125 self._partitions[last_log_free].set_mb(self._partitions[last_log_free].get_mb()+tmppart_log.get_mb())
126 del self._partitions[part_log]
127 else:
128 if not last_log_free:
129 last_log_free = last_log_minor + 0.9
130 else:
131 lost_log_free = part_log
132 tmppart_log.set_minor(last_log_free)
133 self._partitions[last_log_free] = tmppart_log
134 if part_log != last_log_free: del self._partitions[part_log]
135 continue
136 else:
137 if part_log > (last_log_minor + 1):
138 tmppart_log.set_minor(last_log_minor + 1)
139 last_log_minor = last_log_minor + 1
140 self._partitions[last_log_minor] = tmppart_log
141 del self._partitions[part_log]
142 continue
143 else:
144 last_log_minor = part_log
145 if tmppart.get_type() == "free":
146 if last_minor < last_free:
147 self._partitions[last_free].set_mb(self._partitions[last_free].get_mb()+tmppart.get_mb())
148 del self._partitions[part]
149 else:
150 if not last_free:
151 last_free = last_minor + 0.1
152 else:
153 last_free = part
154 tmppart.set_minor(last_free)
155 self._partitions[last_free] = tmppart
156 if part != last_free: del self._partitions[part]
157 continue
158 else:
159 if part > (last_minor + 1):
160 tmppart.set_minor(last_minor + 1)
161 last_minor = last_minor + 1
162 self._partitions[last_minor] = tmppart
163 del self._partitions[part]
164 continue
165 else:
166 last_minor = part
78 167
168 ##
169 # Adds a new partition to the partition info
170 # @param free_minor minor of unallocated space partition is being created in
171 # @param mb size of partition in MB
172 # @param start Start sector (only used for existing partitions)
173 # @param end End sector (only used for existing partitions)
174 # @param type Partition type (ext2, ext3, fat32, linux-swap, free, extended, etc.)
175 # @param mountpoint='' Partition mountpoint
176 # @param mountopts='' Partition mount options
79 def add_partition(self, minor, start, end, type, mountpoint='', mountopts=''): 177 def add_partition(self, free_minor, mb, start, end, type, mountpoint='', mountopts=''):
80 free_start, free_end = self.get_free_space(start) 178 free_minor = free_minor
81 minor = int(minor) 179 new_minor = int(free_minor) + 1
82 if not free_end: 180# print "add_partition(): free_minor=" + str(free_minor) + ", new_minor=" + str(new_minor)
83 return False
84 if self._partitions.has_key(minor): 181 if self._partitions.has_key(new_minor):
85 parts = self._partitions.keys() 182 parts = self._partitions.keys()
86 parts.sort() 183 parts.sort()
87 parts.reverse() 184 parts.reverse()
88 hole_at = 0 185 hole_at = 0
89 for i in range(1, parts[0]+1): 186 for i in range(1, parts[0]+1):
90 if i <= minor: continue 187 if i <= new_minor: continue
91 if not self._partitions.has_key(int(i)): 188 if not self._partitions.has_key(i):
92 hole_at = i 189 hole_at = i
93 break 190 break
94 stopscooting = 0 191 stopscooting = 0
95 for i in parts: 192 for i in parts:
96 if stopscooting: break 193 if stopscooting: break
97 if (i >= hole_at) and (hole_at): continue 194 if i >= hole_at and hole_at: continue
98 if i >= minor: 195 if i >= new_minor:
99 self._partitions[i].set_minor(i+1) 196 self._partitions[i].set_minor(i+1)
100 self._partitions[i+1] = self._partitions[i] 197 self._partitions[i+1] = self._partitions[i]
101 if i == minor: stopscooting = 1 198 if i == new_minor: stopscooting = 1
199 if mb != self._partitions[free_minor].get_mb():
200 old_free_mb = self._partitions[free_minor].get_mb()
201 del self._partitions[free_minor]
202 if archinfo[self._arch]['extended'] and new_minor >= 5:
203 free_minor = new_minor + 0.9
204 else:
205 free_minor = new_minor + 0.1
206 self._partitions[free_minor] = Partition(self, free_minor, old_free_mb-mb, 0, 0, "free")
207# print "add_partition(): new part doesn't use all freespace. new free part is: minor=" + str(free_minor)
208 else:
209 del self._partitions[free_minor]
102 self._partitions[minor] = Partition(self, minor, '', start, end, 0, type, mountpoint=mountpoint, mountopts=mountopts) 210 self._partitions[new_minor] = Partition(self, new_minor, mb, start, end, type, mountpoint=mountpoint, mountopts=mountopts)
211 if type == "extended":
212 self._partitions[4.9] = Partition(self, 4.9, mb, 0, 0, "free")
213 self.tidy_partitions()
103 214
215 ##
216 # Removes partition from partition info
217 # @param minor Minor of partition to remove
104 def remove_partition(self, minor): 218 def remove_partition(self, minor):
219 tmppart = self._partitions[int(minor)]
220 free_minor = 0
221 if tmppart.is_logical():
222 free_minor = minor-0.1
223 else:
224 free_minor = minor-0.9
225 self._partitions[free_minor] = Partition(self, free_minor, tmppart.get_mb(), 0, 0, "free", format=False, existing=False)
105 del self._partitions[int(minor)] 226 del self._partitions[int(minor)]
227 self.tidy_partitions()
106 228
229 ##
230 # Returns free space (no longer used)
231 # @param start Start sector for search
107 def get_free_space(self, start): 232 def get_free_space(self, start):
108 GAP_SIZE = 100 233 GAP_SIZE = 100
109 parts = self._partitions.keys() 234 parts = self._partitions.keys()
110 parts.sort() 235 parts.sort()
111 lastend_pri = 0 236 lastend_pri = 0
138 if free_start == -1 and lastend_pri < self._total_sectors: 263 if free_start == -1 and lastend_pri < self._total_sectors:
139 free_start = lastend_pri 264 free_start = lastend_pri
140 free_end = self._total_sectors 265 free_end = self._total_sectors
141 return (free_start, free_end) 266 return (free_start, free_end)
142 267
268 ##
269 # Gets partition containing a certain sector (no longer used)
270 # @param sector Sector to look at
271 # @param ignore_extended=1 Ignore extended partitions
143 def get_partition_at(self, sector, ignore_extended=1): 272 def get_partition_at(self, sector, ignore_extended=1):
144 parts = self._partitions.keys() 273 parts = self._partitions.keys()
145 parts.sort() 274 parts.sort()
146 for part in parts: 275 for part in parts:
147 tmppart = self._partitions[part] 276 tmppart = self._partitions[part]
148 if ignore_extended and tmppart.is_extended(): continue 277 if ignore_extended and tmppart.is_extended(): continue
149 if (sector >= tmppart.get_start()) and (sector <= tmppart.get_end()): 278 if (sector >= tmppart.get_start()) and (sector <= tmppart.get_end()):
150 return part 279 return part
151 return 0 280 return 0
152 281
282 ##
283 # Returns free minor (no longer used)
284 # @param start Parameter description
285 # @param end Parameter description
153 def get_free_minor_at(self, start, end): 286 def get_free_minor_at(self, start, end):
154 parts = self._partitions.keys() 287 parts = self._partitions.keys()
155 parts.sort() 288 parts.sort()
156 minor = 1 289 minor = 1
157 lastpart = 0 290 lastpart = 0
177 break 310 break
178 minor = part + 1 311 minor = part + 1
179 lastpart = part 312 lastpart = part
180 return minor 313 return minor
181 314
315 ##
316 # Returns an ordered list (disk order) of partition minors
182 def get_ordered_partition_list(self): 317 def get_ordered_partition_list(self):
183 parts = self._partitions.keys() 318 parts = self._partitions.keys()
184 parts.sort() 319 parts.sort()
185 partlist = [] 320 partlist = []
186 free_start, free_end = self.get_free_space(0)
187 tmppart = None
188 tmppart_log = None 321 tmppart = None
189 for part in parts: 322 for part in parts:
190 if part > 4: break 323 if archinfo[self._arch]['extended'] and part > 4.1: break
191 tmppart = self._partitions[part] 324 tmppart = self._partitions[part]
192 if free_end < tmppart.get_start() and not free_start == -1:
193 partlist.append("Free Space (" + str(free_start) + "-" + str(free_end) + ")")
194 free_start, free_end = self.get_free_space(free_end)
195 newitem = self._device + str(part) + ": " + str(tmppart.get_start()) + "-" + str(tmppart.get_end())
196 if tmppart.is_extended(): newitem = newitem + " extended"
197 partlist.append(newitem) 325 partlist.append(part)
198 if tmppart.is_extended(): 326 if tmppart.is_extended():
199 for part_log in parts: 327 for part_log in parts:
200 if part_log < 5: continue 328 if part_log < 4.9: continue
201 tmppart_log = self._partitions[part_log]
202 if free_end < tmppart_log.get_start() and free_end <= tmppart.get_end() and not free_start == -1:
203 partlist.append("Free Space (" + str(free_start) + "-" + str(free_end) + ")")
204 free_start, free_end = self.get_free_space(free_end)
205 newitem = self._device + str(part_log) + ": " + str(tmppart_log.get_start()) + "-" + str(tmppart_log.get_end()) + " logical"
206 partlist.append(newitem) 329 partlist.append(part_log)
207 if ((tmppart_log == None) or (free_start > tmppart_log.get_end())) and free_start < tmppart.get_end():
208 partlist.append("Free Space (" + str(free_start) + "-" + str(free_end) + ") logical")
209 free_start, free_end = self.get_free_space(free_end)
210 if (tmppart == None) or (free_start > tmppart.get_end()):
211 partlist.append("Free Space (" + str(free_start) + "-" + str(free_end) + ")")
212 return partlist 330 return partlist
213 331
332 ##
333 # Returns partition info in a format suitable for passing to install_profile.set_partition_tables()
214 def get_install_profile_structure(self): 334 def get_install_profile_structure(self):
215 devdic = {} 335 devdic = {}
216 for part in self._partitions: 336 for part in self._partitions:
217 tmppart = self._partitions[part] 337 tmppart = self._partitions[part]
218 devdic[part] = { 'mb': 0, 'minor': int(part), 'origminor': tmppart.get_orig_minor(), 'start': tmppart.get_start(), 'end': tmppart.get_end(), 'type': tmppart.get_type(), 'mountpoint': tmppart.get_mountpoint(), 'mountopts': tmppart.get_mountopts(), 'format': tmppart.get_format() } 338 devdic[part] = { 'mb': tmppart.get_mb(), 'minor': float(part), 'origminor': tmppart.get_orig_minor(), 'start': tmppart.get_start(), 'end': tmppart.get_end(), 'type': tmppart.get_type(), 'mountpoint': tmppart.get_mountpoint(), 'mountopts': tmppart.get_mountopts(), 'format': tmppart.get_format() }
219 return devdic 339 return devdic
220 340
341 ##
342 # Returns the minor of the extended partition, if any
221 def get_extended_partition(self): 343 def get_extended_partition(self):
222 for part in self._partitions: 344 for part in self._partitions:
223 tmppart = self._partitions[part] 345 tmppart = self._partitions[part]
224 if tmppart.is_extended(): 346 if tmppart.is_extended():
225 return part 347 return part
226 return 0 348 return 0
227 349
350 ##
351 # Returns the drive model
352 def get_model(self):
353 return self._parted_dev.model
354
355 ##
356 # Sets the disklabel type
357 def set_disklabel(self, disklabel):
358 self._disklabel = disklabel
359
360 ##
361 # Returns the disklabel type
362 def get_disklabel(self):
363 return self._disklabel
364
365 ##
366 # Returns the number of sectors on the device
228 def get_num_sectors(self): 367 def get_num_sectors(self):
229 return int(self._total_sectors) 368 return int(self._total_sectors)
230 369
370 ##
371 # Returns the size of a cylinder in bytes
231 def get_cylinder_size(self): 372 def get_cylinder_size(self):
232 return int(self._cylinder_bytes) 373 return int(self._cylinder_bytes)
233 374
375 ##
376 # Returns the size of a sector in bytes
234 def get_sector_size(self): 377 def get_sector_size(self):
235 return int(self._sector_bytes) 378 return int(self._sector_bytes)
236 379
380 ##
381 # Returns the number of cylinders
237 def get_num_cylinders(self): 382 def get_num_cylinders(self):
238 return int(self._geometry['cylinders']) 383 return int(self._geometry['cylinders'])
239 384
385 ##
386 # Returns the total number of bytes on the device
240 def get_drive_bytes(self): 387 def get_drive_bytes(self):
241 return int(self._total_bytes) 388 return int(self._total_bytes)
242 389
390 ##
391 # Returns the total number of MB on the device
392 def get_total_mb(self):
393 return self._total_mb
394
395 ##
396 # Returns partition info dictionary
243 def get_partitions(self): 397 def get_partitions(self):
244 return self._partitions 398 return self._partitions
245 399
246 def print_partitions(self): 400 ##
247 for part in self._partitions.keys(): 401 # Prints disk geometry to STDOUT (no longer used)
248 print self._partitions[part].return_info()
249
250 def print_geometry(self): 402 def print_geometry(self):
251 print self._total_bytes, self._geometry 403 print self._total_bytes, self._geometry
252 404
253 def _error(self, message): 405 ##
254 "Raises an exception" 406 # Utility function for running a command and returning it's output as a list
255 raise "DeviceObjectError", message 407 # @param cmd Command to run
256
257 def _run(self, cmd): 408 def _run(self, cmd):
258 "Runs a command and returns the output" 409 "Runs a command and returns the output"
259 410
260 # Run command 411 # Run command
261 output_string = commands.getoutput(cmd) 412 output_string = commands.getoutput(cmd)
275 output_string = output_string[index:] 426 output_string = output_string[index:]
276 427
277 # return output 428 # return output
278 return output_list 429 return output_list
279 430
280 431##
432# This class represents a partition within a GLIStorageDevice object
281class Partition: 433class Partition:
282 "Class representing a single partition within a Device object" 434 "Class representing a single partition within a Device object"
283 435
284 _device = None 436 _device = None
285 _minor = None 437 _minor = 0
286 _orig_minor = "" 438 _orig_minor = 0
287 _bootflag = None
288 _start = None 439 _start = 0
289 _end = None 440 _end = 0
290 _blocks = None
291 _type = None 441 _type = None
292 _mountpoint = None 442 _mountpoint = None
293 _mountopts = None 443 _mountopts = None
294 _format = None 444 _format = None
295 _resizeable = None 445 _resizeable = None
296 _min_sectors_for_resize = 0 446 _min_mb_for_resize = 0
447 _mb = 0
297 448
449 ##
450 # Initialization function for the Partition class
451 # @param device Parent GLIStorageDevice object
452 # @param minor Minor of partition
453 # @param mb Parameter Size of partition in MB
454 # @param start Parameter Start sector of partition
455 # @param end Parameter Start sector of partition
456 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.)
457 # @param mountpoint='' Mountpoint of partition
458 # @param mountopts='' Mount options of partition
459 # @param format=True Format partition
460 # @param existing=False This partition exists on disk
298 def __init__(self, device, minor, bootflag, start, end, blocks, type, mountpoint='', mountopts='', format=True, existing=False): 461 def __init__(self, device, minor, mb, start, end, type, mountpoint='', mountopts='', format=True, existing=False, origminor=0):
299 self._device = device 462 self._device = device
300 self._minor = int(minor) 463 self._minor = float(minor)
301 if existing: self._orig_minor = int(minor)
302 self._bootflag = bootflag
303 self._start = int(start) 464 self._start = int(start)
304 self._end = int(end) 465 self._end = int(end)
305 self._blocks = int(blocks)
306 if type == "": type = "unknown" 466 self._type = type or "unknown"
307 self._type = type
308 self._mountpoint = mountpoint 467 self._mountpoint = mountpoint
309 self._mountopts = mountopts 468 self._mountopts = mountopts
310 self._format = format 469 self._format = format
311 if blocks == 0: 470 self._mb = mb
312 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512 471 self._orig_minor = origminor
472 if type != "free":
473 if existing and not origminor:
474 self._orig_minor = self._minor
475 self._minor = int(self._minor)
476 self._orig_minor = int(self._orig_minor)
313 if existing: 477 if existing:
314 parted_part = device._parted_disk.get_partition(minor) 478 parted_part = device._parted_disk.get_partition(self._orig_minor)
479 label_type = device._parted_disk.type.name
480 if label_type == "loop":
481 dev_node = device._device
482 else:
483 dev_node = device._device + str(self._orig_minor)
484# print "dev_node = " + dev_node
315 if type == "ntfs": 485 if type == "ntfs":
316 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 .\+//'")) 486 min_bytes = int(commands.getoutput("ntfsresize -f --info " + dev_node + " | grep -e '^You might resize' | sed -e 's/You might resize at //' -e 's/ bytes or .\+//'"))
317 self._min_cylinders_for_resize = int(min_bytes / self._device._cylinder_bytes) + 1 487 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1
318 self._resizeable == True 488 self._resizeable = True
319 elif type == "ext2" or type == "ext3": 489 elif type == "ext2" or type == "ext3":
320 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\+//'")) 490 block_size = int(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'")))
321 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\+//'")) 491 free_blocks = int(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'")))
322 free_sec = int(int(block_size) * int(free_blocks) / self._device._sector_bytes) 492 free_bytes = int(block_size * free_blocks)
323 free_sec = free_sec - 2000 # just to be safe 493 # can't hurt to pad (the +50) it a bit since this is really just a guess
324 self._min_sectors_for_resize = (self._end - self._start + 1) - free_sec 494 self._min_mb_for_resize = self._mb - int(free_bytes / MEGABYTE) + 50
325 self._resizeable == True 495 self._resizeable = True
326 else: 496 else:
327 parted_part = self._device._parted_disk.get_partition(self._minor) 497 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor))
328 try: 498 try:
329 parted_fs = parted_part.geom.file_system_open() 499 parted_fs = parted_part.geom.file_system_open()
330 except: 500 except:
331 self._resizeable = False 501 self._resizeable = False
332 return 502 return
333 resize_constraint = parted_fs.get_resize_constraint() 503 resize_constraint = parted_fs.get_resize_constraint()
334 min_size = resize_constraint.min_size 504 min_bytes = resize_constraint.min_size * self._device._sector_bytes
335 if int(min_size) != min_size: min_size = int(min_size) + 1 505 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1
336 self._min_sectors_for_resize = min_size
337 self._resizeable = True 506 self._resizeable = True
338 507
508 ##
509 # Returns whether or not the partition is extended
339 def is_extended(self): 510 def is_extended(self):
340 if self._type == "extended": 511 if self._type == "extended":
341 return True 512 return True
342 else: 513 else:
343 return False 514 return False
344 515
516 ##
517 # Returns whether or not the partition is logical
345 def is_logical(self): 518 def is_logical(self):
346 part = self._device.get_partition_at(self._start, ignore_extended=0) 519 if self._type == "free":
347 if part and self._device._partitions[part].is_extended() and not part == self._minor: 520 if int(self._minor) + 0.9 == self._minor:
521 return True
522 else:
523 return False
524 elif archinfo[self._device._arch]['extended'] and self._minor > 4:
348 return True 525 return True
526 else:
349 return False 527 return False
350 528
529 ##
530 # Returns a list of logical partitions if this is an extended partition
351 def get_logicals(self): 531 def get_logicals(self):
352 if not self.is_extended(): 532 if not self.is_extended():
353 return None 533 return None
354 logicals = [] 534 logicals = []
355 start = self._start
356 parts = self._device._partitions.keys() 535 parts = self._device._partitions.keys()
357 parts.sort() 536 parts.sort()
358 for part in parts: 537 for part in parts:
359 if part < 5: continue 538 if part < 5: continue
360 logicals.append(part) 539 logicals.append(part)
361 logicals.sort() 540 logicals.sort()
362 return logicals 541 return logicals
363 542
543 ##
544 # Returns the extened parent partition if this is a logical partition (no longer used)
364 def get_extended_parent(self): 545 def get_extended_parent(self):
365 if not self.is_logical(): 546 if not self.is_logical():
366 return None 547 return None
367 else: 548 else:
368 return self._device.get_partition_at(self._start, ignore_extended=0) 549 return self._device.get_partition_at(self._start, ignore_extended=0)
369 550
551 ##
552 # Sets the start sector for the partition
553 # @param start Start sector
370 def set_start(self, start): 554 def set_start(self, start):
371 self._start = int(start) 555 self._start = int(start)
372 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512
373 556
557 ##
558 # Returns the start sector for the partition
374 def get_start(self): 559 def get_start(self):
375 return int(self._start) 560 return int(self._start)
376 561
562 ##
563 # Sets the end sector of the partition
564 # @param end End sector
377 def set_end(self, end): 565 def set_end(self, end):
378 self._end = int(end) 566 self._end = int(end)
379 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512
380 567
568 ##
569 # Returns end sector for the partition
381 def get_end(self): 570 def get_end(self):
382 return int(self._end) 571 return int(self._end)
383 572
573 ##
574 # Returns size of partition in MB
575 def get_mb(self):
576 return int(self._mb)
577
578 ##
579 # Sets size of partition in MB
580 # @param mb Parameter description
581 def set_mb(self, mb):
582 self._mb = int(mb)
583
584 ##
585 # Sets type of partition
586 # @param type Parameter description
384 def set_type(self, type): 587 def set_type(self, type):
385 self._type = type 588 self._type = type
386 589
590 ##
591 # Returns type of partition
387 def get_type(self): 592 def get_type(self):
388 return self._type 593 return self._type
389 594
595 ##
596 # Returns parent GLIStorageDevice object
390 def get_device(self): 597 def get_device(self):
391 return self._device 598 return self._device
392 599
600 ##
601 # Sets minor of partition
602 # @param minor New minor
393 def set_minor(self, minor): 603 def set_minor(self, minor):
394 self._minor = int(minor) 604 self._minor = float(minor)
395 605
606 ##
607 # Returns minor of partition
396 def get_minor(self): 608 def get_minor(self):
397 return int(self._minor) 609 return float(self._minor)
398 610
611 ##
612 # Sets the original minor of the partition
613 # @param orig_minor Parameter description
399 def set_orig_minor(self, orig_minor): 614 def set_orig_minor(self, orig_minor):
400 self._orig_minor = int(orig_minor) 615 self._orig_minor = int(orig_minor)
401 616
617 ##
618 # Returns the original minor of the partition
402 def get_orig_minor(self): 619 def get_orig_minor(self):
403 return self._orig_minor 620 return self._orig_minor
404 621
622 ##
623 # Sets the mountpoint for the partition
624 # @param mountpoint Mountpoint
405 def set_mountpoint(self, mountpoint): 625 def set_mountpoint(self, mountpoint):
406 self._mountpoint = mountpoint 626 self._mountpoint = mountpoint
407 627
628 ##
629 # Returns the mountpoint for the partition
408 def get_mountpoint(self): 630 def get_mountpoint(self):
409 return self._mountpoint 631 return self._mountpoint
410 632
633 ##
634 # Sets the mount options for the partition
635 # @param mountopts Mount options
411 def set_mountopts(self, mountopts): 636 def set_mountopts(self, mountopts):
412 self._mountopts = mountopts 637 self._mountopts = mountopts
413 638
639 ##
640 # Returns the mount options for the partition
414 def get_mountopts(self): 641 def get_mountopts(self):
415 return self._mountopts 642 return self._mountopts
416 643
644 ##
645 # Set whether to format the partition
646 # @param format Format this partition (True/False)
417 def set_format(self, format): 647 def set_format(self, format):
418 self._format = format 648 self._format = format
419 649
650 ##
651 # Returns whether to format the partition
420 def get_format(self): 652 def get_format(self):
421 return self._format 653 return self._format
422 654
423 def get_blocks(self): 655 ##
424 return int(self._blocks) 656 # Returns whether the partition is resizeable
657 def is_resizeable(self):
658 return self._resizeable
425 659
660 ##
661 # Returns minimum MB for resize
426 def get_min_sectors_for_resize(self): 662 def get_min_mb_for_resize(self):
427 if self.is_extended(): 663# if self.is_extended():
428 min_size = self._start 664# min_size = self._start
429 for part in self._device._partitions: 665# for part in self._device._partitions:
430 if part < 5: continue 666# if part < 5: continue
431 if part.get_end > min_size: min_size = part.get_end() 667# if part.get_end > min_size: min_size = part.get_end()
432 return min_size 668# return min_size
669# else:
670 if self._resizeable:
671 return self._min_mb_for_resize
433 else: 672 else:
434 return self._min_sectors_for_resize 673 return -1
435 674
675 ##
676 # Returns maximum MB for resize
436 def get_max_sectors_for_resize(self): 677 def get_max_mb_for_resize(self):
437 free_start, free_end = self._device.get_free_space(self._end) 678 if self._resizeable:
438 if free_end == -1: return self._end 679 free_minor = 0
439 if free_start - 1 == self._end:
440 if self.is_logical(): 680 if self.is_logical():
441 if free_end <= self._device._partitions[self.get_extended_parent()]._end: 681 free_minor = self._minor + 0.9
442 return free_end - self._start
443 else:
444 return self._end - self._start
445 else: 682 else:
446 return free_end - self._start 683 free_minor = self._minor + 0.1
684 if free_minor in self._device._partitions:
685 return self._mb + self._device._partitions[free_minor]._mb
686 else:
687 return self._mb
688 else:
689 return -1
447 690
691 ##
692 # Resizes the partition
693 # @param mb New size in MB
448 def resize(self, start, end): 694 def resize(self, mb):
449 part_at_start = self._device.get_partition_at(int(start)) 695 free_minor = self._minor
450 part_at_end = self._device.get_partition_at(int(end))
451 logicals = None
452 if self.is_logical(): 696 if self.is_logical():
453 parent = self.get_extended_parent() 697 free_minor += 0.9
454 parentstart = int(self._device._partitions[parent].get_start()) 698 else:
455 parentend = int(self._device._partitions[parent].get_end()) 699 free_minor += 0.1
456 if (start < parentstart) or (end > parentend): return 0 700 if mb < self._mb:
457 if self.is_extended(): 701 # Shrinking
458 logicals = self.get_logicals() 702 if not free_minor in self._device._partitions:
459 if len(logicals): 703 self._device._partitions[free_minor] = Partition(self._device, free_minor, 0, 0, 0, "free", format=False, existing=False)
460 logicals_start = self._device._partitions[logicals[0]].get_start() 704 self._device._partitions[free_minor]._mb += self._mb - mb
461 logicals_end = self._device._partitions[logicals[len(logicals)-1]].get_end() 705 self._mb = mb
462 if (start > logicals_start) or (end < logicals_end): return 0 706 elif mb == self._mb + self._device._partitions[free_minor]._mb:
463 if part_at_start in logicals: part_at_start = 0 707 # Using all available unallocated space
464 if part_at_end in logicals: part_at_end = 0 708 del self._device._partitions[free_minor]
465 if ((not part_at_start == 0) and (part_at_start != self._minor)) or ((not part_at_end == 0) and (part_at_end != self._minor)): 709 self._mb = mb
466 return 0 710 elif mb > self._mb:
467 self.set_start(start) 711 # Growing
468 self.set_end(end) 712 self._device._partitions[free_minor]._mb = mb - self._mb
469 return 1 713 self._mb = mb
470 714
471 def _error(self, message): 715##
472 "Raises an exception" 716# Returns a list of detected partitionable devices
473 raise "PartitionObjectError", message
474
475
476def detect_devices(): 717def detect_devices():
477 "Returns a list of partitionable devices on the system"
478
479 devices = [] 718 devices = []
480 719
481 # Make sure sysfs exists 720 # Make sure sysfs exists
482 if not os.path.exists("/sys/bus"): 721 if not os.path.exists("/sys/bus"):
483 raise Exception, "no sysfs found (you MUST use a kernel >2.6)" 722 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)")
484 # Make sure /proc/partitions exists 723 # Make sure /proc/partitions exists
485 if not os.path.exists("/proc/partitions"): 724 if not os.path.exists("/proc/partitions"):
486 raise Exception, "/proc/partitions does not exist!" 725 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "/proc/partitions does not exist! Please make sure procfs is in your kernel and mounted!")
487 726
488 # Load /proc/partitions into the variable 'partitions' 727 # Load /proc/partitions into the variable 'partitions'
489 partitions = [] 728 partitions = []
490 for line in open("/proc/partitions"): 729 for line in open("/proc/partitions"):
491 if len(line.split()) < 4 or not line.split()[0].isdigit() or \ 730 if len(line.split()) < 4 or not line.split()[0].isdigit() or not line.split()[1].isdigit():
492 not line.split()[1].isdigit():
493 continue 731 continue
494 732
495 # Get the major, minor and device name 733 # Get the major, minor and device name
496 major = line.split()[0] 734 major = line.split()[0]
497 minor = line.split()[1] 735 minor = line.split()[1]
507 # all the devices in /dev to try and find a 745 # all the devices in /dev to try and find a
508 # devices with the same major and minor 746 # devices with the same major and minor
509 if not os.path.exists(device): 747 if not os.path.exists(device):
510 device = None 748 device = None
511 for path, dirs, files in os.walk("/dev"): 749 for path, dirs, files in os.walk("/dev"):
512 for file in files: 750 for d_file in files:
513 full_file = os.path.join(path, file) 751 full_file = os.path.join(path, d_file)
514 if not os.path.exists(full_file): 752 if not os.path.exists(full_file):
515 continue 753 continue
516 statres = os.stat(full_file) 754 statres = os.stat(full_file)
517 fmaj = os.major(statres.st_rdev) 755 fmaj = os.major(statres.st_rdev)
518 fmin = os.minor(statres.st_rdev) 756 fmin = os.minor(statres.st_rdev)
530 if os.path.exists("/sys/bus/" + dev_type): 768 if os.path.exists("/sys/bus/" + dev_type):
531 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices") 769 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices")
532 770
533 # For each device in the devices on that bus 771 # For each device in the devices on that bus
534 for sysfs_device in sysfs_devices: 772 for sysfs_device in sysfs_devices:
535 dev_file = "/sys/bus/" + dev_type + "/devices/"\ 773 dev_file = "/sys/bus/" + dev_type + "/devices/" + sysfs_device + "/block/dev"
536 + sysfs_device + "/block/dev"
537 774
538 # If the file is not a block device, loop 775 # If the file is not a block device, loop
539 if not os.path.exists(dev_file): 776 if not os.path.exists(dev_file):
540 continue 777 continue
541 778
543 try: 780 try:
544 major, minor = open(dev_file).read().split(":") 781 major, minor = open(dev_file).read().split(":")
545 major = int(major) 782 major = int(major)
546 minor = int(minor) 783 minor = int(minor)
547 except: 784 except:
548 raise Exception, "invalid major minor in "\ 785 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "invalid major minor in " + dev_file)
549 + dev_file
550 786
551 # Find a device listed in /proc/partitions 787 # Find a device listed in /proc/partitions
552 # that has the same minor and major as our 788 # that has the same minor and major as our
553 # current block device. 789 # current block device.
554 for record in partitions: 790 for record in partitions:
555 if major == record[0] and minor == record[1]: 791 if major == record[0] and minor == record[1]:
556 devices.append(record[2]) 792 devices.append(record[2])
557 793
794 # For testing the partitioning code
795 if GLIUtility.is_file("/tmp/disk.img"):
796 devices.append("/tmp/disk.img")
797
558 # We have assembled the list of devices, so return it 798 # We have assembled the list of devices, so return it
559 return devices 799 return devices

Legend:
Removed from v.386  
changed lines
  Added in v.625

  ViewVC Help
Powered by ViewVC 1.1.20