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

Diff of /trunk/src/GLIStorageDevice.py

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20