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

Diff of /trunk/src/GLIStorageDevice.py

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

Revision 466 Revision 596
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=['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 # Sets the disklabel type
352 def set_disklabel(self, disklabel):
353 self._disklabel = disklabel
354
355 ##
356 # Returns the disklabel type
357 def get_disklabel(self):
358 return self._disklabel
359
360 ##
361 # Returns the number of sectors on the device
228 def get_num_sectors(self): 362 def get_num_sectors(self):
229 return int(self._total_sectors) 363 return int(self._total_sectors)
230 364
365 ##
366 # Returns the size of a cylinder in bytes
231 def get_cylinder_size(self): 367 def get_cylinder_size(self):
232 return int(self._cylinder_bytes) 368 return int(self._cylinder_bytes)
233 369
370 ##
371 # Returns the size of a sector in bytes
234 def get_sector_size(self): 372 def get_sector_size(self):
235 return int(self._sector_bytes) 373 return int(self._sector_bytes)
236 374
375 ##
376 # Returns the number of cylinders
237 def get_num_cylinders(self): 377 def get_num_cylinders(self):
238 return int(self._geometry['cylinders']) 378 return int(self._geometry['cylinders'])
239 379
380 ##
381 # Returns the total number of bytes on the device
240 def get_drive_bytes(self): 382 def get_drive_bytes(self):
241 return int(self._total_bytes) 383 return int(self._total_bytes)
242 384
385 ##
386 # Returns the total number of MB on the device
387 def get_total_mb(self):
388 return self._total_mb
389
390 ##
391 # Returns partition info dictionary
243 def get_partitions(self): 392 def get_partitions(self):
244 return self._partitions 393 return self._partitions
245 394
246 def print_partitions(self): 395 ##
247 for part in self._partitions.keys(): 396 # Prints disk geometry to STDOUT (no longer used)
248 print self._partitions[part].return_info()
249
250 def print_geometry(self): 397 def print_geometry(self):
251 print self._total_bytes, self._geometry 398 print self._total_bytes, self._geometry
252 399
253 def _error(self, message): 400 ##
254 "Raises an exception" 401 # Utility function for running a command and returning it's output as a list
255 raise "DeviceObjectError", message 402 # @param cmd Command to run
256
257 def _run(self, cmd): 403 def _run(self, cmd):
258 "Runs a command and returns the output" 404 "Runs a command and returns the output"
259 405
260 # Run command 406 # Run command
261 output_string = commands.getoutput(cmd) 407 output_string = commands.getoutput(cmd)
275 output_string = output_string[index:] 421 output_string = output_string[index:]
276 422
277 # return output 423 # return output
278 return output_list 424 return output_list
279 425
280 426##
427# This class represents a partition within a GLIStorageDevice object
281class Partition: 428class Partition:
282 "Class representing a single partition within a Device object" 429 "Class representing a single partition within a Device object"
283 430
284 _device = None 431 _device = None
285 _minor = None 432 _minor = 0
286 _orig_minor = "" 433 _orig_minor = 0
287 _bootflag = None
288 _start = None 434 _start = 0
289 _end = None 435 _end = 0
290 _blocks = None
291 _type = None 436 _type = None
292 _mountpoint = None 437 _mountpoint = None
293 _mountopts = None 438 _mountopts = None
294 _format = None 439 _format = None
295 _resizeable = None 440 _resizeable = None
296 _min_sectors_for_resize = 0 441 _min_mb_for_resize = 0
442 _mb = 0
297 443
444 ##
445 # Initialization function for the Partition class
446 # @param device Parent GLIStorageDevice object
447 # @param minor Minor of partition
448 # @param mb Parameter Size of partition in MB
449 # @param start Parameter Start sector of partition
450 # @param end Parameter Start sector of partition
451 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.)
452 # @param mountpoint='' Mountpoint of partition
453 # @param mountopts='' Mount options of partition
454 # @param format=True Format partition
455 # @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): 456 def __init__(self, device, minor, mb, start, end, type, mountpoint='', mountopts='', format=True, existing=False, origminor=0):
299 self._device = device 457 self._device = device
300 self._minor = int(minor) 458 self._minor = float(minor)
301 if existing: self._orig_minor = int(minor)
302 self._bootflag = bootflag
303 self._start = int(start) 459 self._start = int(start)
304 self._end = int(end) 460 self._end = int(end)
305 self._blocks = int(blocks)
306 if type == "": type = "unknown" 461 self._type = type or "unknown"
307 self._type = type
308 self._mountpoint = mountpoint 462 self._mountpoint = mountpoint
309 self._mountopts = mountopts 463 self._mountopts = mountopts
310 self._format = format 464 self._format = format
311 if blocks == 0: 465 self._mb = mb
312 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512 466 self._orig_minor = origminor
467 if type != "free":
468 if existing and not origminor:
469 self._orig_minor = self._minor
470 self._minor = int(self._minor)
471 self._orig_minor = int(self._orig_minor)
313 if existing: 472 if existing:
314 parted_part = device._parted_disk.get_partition(minor) 473 parted_part = device._parted_disk.get_partition(self._orig_minor)
315 label_type = device._parted_disk.type.name 474 label_type = device._parted_disk.type.name
316 if label_type == "loop": 475 if label_type == "loop":
317 dev_node = device._device 476 dev_node = device._device
318 else: 477 else:
319 dev_node = device._device + str(minor) 478 dev_node = device._device + str(self._orig_minor)
479 print "dev_node = " + dev_node
320 if type == "ntfs": 480 if type == "ntfs":
321 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 .\+//'")) 481 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 .\+//'"))
322 self._min_cylinders_for_resize = int(min_bytes / self._device._cylinder_bytes) + 1 482 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1
323 self._resizeable == True 483 self._resizeable = True
324 elif type == "ext2" or type == "ext3": 484 elif type == "ext2" or type == "ext3":
325 block_size = string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'")) 485 block_size = int(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\s\+//'")))
326 free_blocks = string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'")) 486 free_blocks = int(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'")))
327 free_sec = int(int(block_size) * int(free_blocks) / self._device._sector_bytes) 487 free_bytes = int(block_size * free_blocks)
328 free_sec = free_sec - 2000 # just to be safe 488 # can't hurt to pad (the +50) it a bit since this is really just a guess
329 self._min_sectors_for_resize = (self._end - self._start + 1) - free_sec 489 self._min_mb_for_resize = self._mb - int(free_bytes / MEGABYTE) + 50
330 self._resizeable == True 490 self._resizeable = True
331 else: 491 else:
332 parted_part = self._device._parted_disk.get_partition(self._minor) 492 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor))
333 try: 493 try:
334 parted_fs = parted_part.geom.file_system_open() 494 parted_fs = parted_part.geom.file_system_open()
335 except: 495 except:
336 self._resizeable = False 496 self._resizeable = False
337 return 497 return
338 resize_constraint = parted_fs.get_resize_constraint() 498 resize_constraint = parted_fs.get_resize_constraint()
339 min_size = resize_constraint.min_size 499 min_bytes = resize_constraint.min_size * self._device._sector_bytes
340 if int(min_size) != min_size: min_size = int(min_size) + 1 500 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1
341 self._min_sectors_for_resize = min_size
342 self._resizeable = True 501 self._resizeable = True
343 502
503 ##
504 # Returns whether or not the partition is extended
344 def is_extended(self): 505 def is_extended(self):
345 if self._type == "extended": 506 if self._type == "extended":
346 return True 507 return True
347 else: 508 else:
348 return False 509 return False
349 510
511 ##
512 # Returns whether or not the partition is logical
350 def is_logical(self): 513 def is_logical(self):
351 part = self._device.get_partition_at(self._start, ignore_extended=0) 514 if self._type == "free":
352 if part and self._device._partitions[part].is_extended() and not part == self._minor: 515 if int(self._minor) + 0.9 == self._minor:
516 return True
517 else:
518 return False
519 elif archinfo[self._device._arch]['extended'] and self._minor > 4:
353 return True 520 return True
521 else:
354 return False 522 return False
355 523
524 ##
525 # Returns a list of logical partitions if this is an extended partition
356 def get_logicals(self): 526 def get_logicals(self):
357 if not self.is_extended(): 527 if not self.is_extended():
358 return None 528 return None
359 logicals = [] 529 logicals = []
360 start = self._start
361 parts = self._device._partitions.keys() 530 parts = self._device._partitions.keys()
362 parts.sort() 531 parts.sort()
363 for part in parts: 532 for part in parts:
364 if part < 5: continue 533 if part < 5: continue
365 logicals.append(part) 534 logicals.append(part)
366 logicals.sort() 535 logicals.sort()
367 return logicals 536 return logicals
368 537
538 ##
539 # Returns the extened parent partition if this is a logical partition (no longer used)
369 def get_extended_parent(self): 540 def get_extended_parent(self):
370 if not self.is_logical(): 541 if not self.is_logical():
371 return None 542 return None
372 else: 543 else:
373 return self._device.get_partition_at(self._start, ignore_extended=0) 544 return self._device.get_partition_at(self._start, ignore_extended=0)
374 545
546 ##
547 # Sets the start sector for the partition
548 # @param start Start sector
375 def set_start(self, start): 549 def set_start(self, start):
376 self._start = int(start) 550 self._start = int(start)
377 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512
378 551
552 ##
553 # Returns the start sector for the partition
379 def get_start(self): 554 def get_start(self):
380 return int(self._start) 555 return int(self._start)
381 556
557 ##
558 # Sets the end sector of the partition
559 # @param end End sector
382 def set_end(self, end): 560 def set_end(self, end):
383 self._end = int(end) 561 self._end = int(end)
384 self._blocks = ((self._end - self._start) * self._device.get_cylinder_size()) / 512
385 562
563 ##
564 # Returns end sector for the partition
386 def get_end(self): 565 def get_end(self):
387 return int(self._end) 566 return int(self._end)
388 567
568 ##
569 # Returns size of partition in MB
570 def get_mb(self):
571 return int(self._mb)
572
573 ##
574 # Sets size of partition in MB
575 # @param mb Parameter description
576 def set_mb(self, mb):
577 self._mb = int(mb)
578
579 ##
580 # Sets type of partition
581 # @param type Parameter description
389 def set_type(self, type): 582 def set_type(self, type):
390 self._type = type 583 self._type = type
391 584
585 ##
586 # Returns type of partition
392 def get_type(self): 587 def get_type(self):
393 return self._type 588 return self._type
394 589
590 ##
591 # Returns parent GLIStorageDevice object
395 def get_device(self): 592 def get_device(self):
396 return self._device 593 return self._device
397 594
595 ##
596 # Sets minor of partition
597 # @param minor New minor
398 def set_minor(self, minor): 598 def set_minor(self, minor):
399 self._minor = int(minor) 599 self._minor = float(minor)
400 600
601 ##
602 # Returns minor of partition
401 def get_minor(self): 603 def get_minor(self):
402 return int(self._minor) 604 return float(self._minor)
403 605
606 ##
607 # Sets the original minor of the partition
608 # @param orig_minor Parameter description
404 def set_orig_minor(self, orig_minor): 609 def set_orig_minor(self, orig_minor):
405 self._orig_minor = int(orig_minor) 610 self._orig_minor = int(orig_minor)
406 611
612 ##
613 # Returns the original minor of the partition
407 def get_orig_minor(self): 614 def get_orig_minor(self):
408 return self._orig_minor 615 return self._orig_minor
409 616
617 ##
618 # Sets the mountpoint for the partition
619 # @param mountpoint Mountpoint
410 def set_mountpoint(self, mountpoint): 620 def set_mountpoint(self, mountpoint):
411 self._mountpoint = mountpoint 621 self._mountpoint = mountpoint
412 622
623 ##
624 # Returns the mountpoint for the partition
413 def get_mountpoint(self): 625 def get_mountpoint(self):
414 return self._mountpoint 626 return self._mountpoint
415 627
628 ##
629 # Sets the mount options for the partition
630 # @param mountopts Mount options
416 def set_mountopts(self, mountopts): 631 def set_mountopts(self, mountopts):
417 self._mountopts = mountopts 632 self._mountopts = mountopts
418 633
634 ##
635 # Returns the mount options for the partition
419 def get_mountopts(self): 636 def get_mountopts(self):
420 return self._mountopts 637 return self._mountopts
421 638
639 ##
640 # Set whether to format the partition
641 # @param format Format this partition (True/False)
422 def set_format(self, format): 642 def set_format(self, format):
423 self._format = format 643 self._format = format
424 644
645 ##
646 # Returns whether to format the partition
425 def get_format(self): 647 def get_format(self):
426 return self._format 648 return self._format
427 649
428 def get_blocks(self): 650 ##
429 return int(self._blocks) 651 # Returns whether the partition is resizeable
652 def is_resizeable(self):
653 return self._resizeable
430 654
655 ##
656 # Returns minimum MB for resize
431 def get_min_sectors_for_resize(self): 657 def get_min_mb_for_resize(self):
432 if self.is_extended(): 658# if self.is_extended():
433 min_size = self._start 659# min_size = self._start
434 for part in self._device._partitions: 660# for part in self._device._partitions:
435 if part < 5: continue 661# if part < 5: continue
436 if part.get_end > min_size: min_size = part.get_end() 662# if part.get_end > min_size: min_size = part.get_end()
437 return min_size 663# return min_size
664# else:
665 if self._resizeable:
666 return self._min_mb_for_resize
438 else: 667 else:
439 return self._min_sectors_for_resize 668 return -1
440 669
670 ##
671 # Returns maximum MB for resize
441 def get_max_sectors_for_resize(self): 672 def get_max_mb_for_resize(self):
442 free_start, free_end = self._device.get_free_space(self._end) 673 if self._resizeable:
443 if free_end == -1: return self._end 674 free_minor = 0
444 if free_start - 1 == self._end:
445 if self.is_logical(): 675 if self.is_logical():
446 if free_end <= self._device._partitions[self.get_extended_parent()]._end: 676 free_minor = self._minor + 0.9
447 return free_end - self._start
448 else:
449 return self._end - self._start
450 else: 677 else:
451 return free_end - self._start 678 free_minor = self._minor + 0.1
679 if free_minor in self._device._partitions:
680 return self._mb + self._device._partitions[free_minor]._mb
681 else:
682 return self._mb
683 else:
684 return -1
452 685
686 ##
687 # Resizes the partition
688 # @param mb New size in MB
453 def resize(self, start, end): 689 def resize(self, mb):
454 part_at_start = self._device.get_partition_at(int(start)) 690 free_minor = self._minor
455 part_at_end = self._device.get_partition_at(int(end))
456 logicals = None
457 if self.is_logical(): 691 if self.is_logical():
458 parent = self.get_extended_parent() 692 free_minor += 0.9
459 parentstart = int(self._device._partitions[parent].get_start()) 693 else:
460 parentend = int(self._device._partitions[parent].get_end()) 694 free_minor += 0.1
461 if (start < parentstart) or (end > parentend): return 0 695 if mb < self._mb:
462 if self.is_extended(): 696 # Shrinking
463 logicals = self.get_logicals() 697 if not free_minor in self._device._partitions:
464 if len(logicals): 698 self._device._partitions[free_minor] = Partition(self._device, free_minor, 0, 0, 0, "free", format=False, existing=False)
465 logicals_start = self._device._partitions[logicals[0]].get_start() 699 self._device._partitions[free_minor]._mb += self._mb - mb
466 logicals_end = self._device._partitions[logicals[len(logicals)-1]].get_end() 700 self._mb = mb
467 if (start > logicals_start) or (end < logicals_end): return 0 701 elif mb == self._mb + self._device._partitions[free_minor]._mb:
468 if part_at_start in logicals: part_at_start = 0 702 # Using all available unallocated space
469 if part_at_end in logicals: part_at_end = 0 703 del self._device._partitions[free_minor]
470 if ((not part_at_start == 0) and (part_at_start != self._minor)) or ((not part_at_end == 0) and (part_at_end != self._minor)): 704 self._mb = mb
471 return 0 705 elif mb > self._mb:
472 self.set_start(start) 706 # Growing
473 self.set_end(end) 707 self._device._partitions[free_minor]._mb = mb - self._mb
474 return 1 708 self._mb = mb
475 709
476 def _error(self, message): 710##
477 "Raises an exception" 711# Returns a list of detected partitionable devices
478 raise "PartitionObjectError", message
479
480
481def detect_devices(): 712def detect_devices():
482 "Returns a list of partitionable devices on the system"
483
484 devices = [] 713 devices = []
485 714
486 # Make sure sysfs exists 715 # Make sure sysfs exists
487 if not os.path.exists("/sys/bus"): 716 if not os.path.exists("/sys/bus"):
488 raise Exception, "no sysfs found (you MUST use a kernel >2.6)" 717 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)")
489 # Make sure /proc/partitions exists 718 # Make sure /proc/partitions exists
490 if not os.path.exists("/proc/partitions"): 719 if not os.path.exists("/proc/partitions"):
491 raise Exception, "/proc/partitions does not exist!" 720 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "/proc/partitions does not exist! Please make sure procfs is in your kernel and mounted!")
492 721
493 # Load /proc/partitions into the variable 'partitions' 722 # Load /proc/partitions into the variable 'partitions'
494 partitions = [] 723 partitions = []
495 for line in open("/proc/partitions"): 724 for line in open("/proc/partitions"):
496 if len(line.split()) < 4 or not line.split()[0].isdigit() or \ 725 if len(line.split()) < 4 or not line.split()[0].isdigit() or not line.split()[1].isdigit():
497 not line.split()[1].isdigit():
498 continue 726 continue
499 727
500 # Get the major, minor and device name 728 # Get the major, minor and device name
501 major = line.split()[0] 729 major = line.split()[0]
502 minor = line.split()[1] 730 minor = line.split()[1]
512 # all the devices in /dev to try and find a 740 # all the devices in /dev to try and find a
513 # devices with the same major and minor 741 # devices with the same major and minor
514 if not os.path.exists(device): 742 if not os.path.exists(device):
515 device = None 743 device = None
516 for path, dirs, files in os.walk("/dev"): 744 for path, dirs, files in os.walk("/dev"):
517 for file in files: 745 for d_file in files:
518 full_file = os.path.join(path, file) 746 full_file = os.path.join(path, d_file)
519 if not os.path.exists(full_file): 747 if not os.path.exists(full_file):
520 continue 748 continue
521 statres = os.stat(full_file) 749 statres = os.stat(full_file)
522 fmaj = os.major(statres.st_rdev) 750 fmaj = os.major(statres.st_rdev)
523 fmin = os.minor(statres.st_rdev) 751 fmin = os.minor(statres.st_rdev)
535 if os.path.exists("/sys/bus/" + dev_type): 763 if os.path.exists("/sys/bus/" + dev_type):
536 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices") 764 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices")
537 765
538 # For each device in the devices on that bus 766 # For each device in the devices on that bus
539 for sysfs_device in sysfs_devices: 767 for sysfs_device in sysfs_devices:
540 dev_file = "/sys/bus/" + dev_type + "/devices/"\ 768 dev_file = "/sys/bus/" + dev_type + "/devices/" + sysfs_device + "/block/dev"
541 + sysfs_device + "/block/dev"
542 769
543 # If the file is not a block device, loop 770 # If the file is not a block device, loop
544 if not os.path.exists(dev_file): 771 if not os.path.exists(dev_file):
545 continue 772 continue
546 773
548 try: 775 try:
549 major, minor = open(dev_file).read().split(":") 776 major, minor = open(dev_file).read().split(":")
550 major = int(major) 777 major = int(major)
551 minor = int(minor) 778 minor = int(minor)
552 except: 779 except:
553 raise Exception, "invalid major minor in "\ 780 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "invalid major minor in " + dev_file)
554 + dev_file
555 781
556 # Find a device listed in /proc/partitions 782 # Find a device listed in /proc/partitions
557 # that has the same minor and major as our 783 # that has the same minor and major as our
558 # current block device. 784 # current block device.
559 for record in partitions: 785 for record in partitions:
560 if major == record[0] and minor == record[1]: 786 if major == record[0] and minor == record[1]:
561 devices.append(record[2]) 787 devices.append(record[2])
562 788
789 # For testing the partitioning code
790 if GLIUtility.is_file("/tmp/disk.img"):
791 devices.append("/tmp/disk.img")
792
563 # We have assembled the list of devices, so return it 793 # We have assembled the list of devices, so return it
564 return devices 794 return devices

Legend:
Removed from v.466  
changed lines
  Added in v.596

  ViewVC Help
Powered by ViewVC 1.1.20