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

Diff of /trunk/src/GLIStorageDevice.py

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

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

Legend:
Removed from v.113  
changed lines
  Added in v.556

  ViewVC Help
Powered by ViewVC 1.1.20