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

Diff of /trunk/src/GLIStorageDevice.py

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

Revision 596 Revision 924
1# Copyright 1999-2005 Gentoo Foundation
2# This source code is distributed under the terms of version 2 of the GNU
3# General Public License as published by the Free Software Foundation, a copy
4# of which can be found in the main directory of this project.
5
1import commands, string, os, parted 6import commands, string, os, parted
2from GLIException import * 7from GLIException import *
3import GLIUtility 8import GLIUtility
4 9
5MEGABYTE = 1024 * 1024 10MEGABYTE = 1024 * 1024
6 11
12# these are here so that we can change them easily in future
13# the values were chosen to represent perfect floating point representations
14FREE_MINOR_FRAC_PRI = 1.0/32.0
15FREE_MINOR_FRAC_LOG = 1.0/8.0
16
7archinfo = { 'sparc': { 'fixedparts': [ { 'minor': 3, 'type': "wholedisk" } ], 'disklabel': 'sun', 'extended': False }, 17archinfo = { 'sparc': { 'fixedparts': [ { 'minor': 3, 'type': "wholedisk" } ], 'disklabel': 'sun', 'extended': False },
8 'hppa': { 'fixedparts': [ { 'minor': 1, 'type': "boot" } ], 'disklabel': 'msdos', 'extended': False }, 18 'hppa': { 'fixedparts': [ { 'minor': 1, 'type': "palo" } ], 'disklabel': 'msdos', 'extended': True },
9 'x86': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True }, 19 'x86': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True },
10 'amd64': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True }, 20 'amd64': { 'fixedparts': [], 'disklabel': 'msdos', 'extended': True },
11 'ppc': { 'fixedparts': [ { 'minor': 1, 'type': "metadata" } ], 'disklabel': 'mac', 'extended': False } 21 'ppc': { 'fixedparts': [ { 'minor': 1, 'type': "metadata" } ], 'disklabel': 'mac', 'extended': False }
12 } 22 }
13 23
32 42
33 ## 43 ##
34 # Initialization function for GLIStorageDevice class 44 # Initialization function for GLIStorageDevice class
35 # @param device Device node (e.g. /dev/hda) of device being represented 45 # @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) 46 # @param arch="x86" Architecture that we're partition for (defaults to 'x86' for now)
37 def __init__(self, device, arch="x86", set_geometry=True): 47 def __init__(self, device, arch="x86", set_geometry=True, virtual=False, size_known=False):
38 self._device = device 48 self._device = device
39 self._partitions = {} 49 self._partitions = {}
40 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512} 50 self._geometry = {'cylinders': 0, 'heads': 0, 'sectors': 0, 'sectorsize': 512}
41 self._total_bytes = 0 51 self._total_bytes = 0
42 self._cylinder_bytes = 0 52 self._cylinder_bytes = 0
57 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders 67 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders
58 self._sector_bytes = self._parted_dev.sector_size 68 self._sector_bytes = self._parted_dev.sector_size
59 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes 69 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes
60 self._total_sectors = self._parted_dev.length 70 self._total_sectors = self._parted_dev.length
61 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors'] 71 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors']
62 self._total_mb = int(self._total_bytes / MEGABYTE) 72 self._total_mb = long(self._total_bytes / MEGABYTE)
63 73
64 ## 74 ##
65 # Sets partition info from disk. 75 # Sets partition info from disk.
66 def set_partitions_from_disk(self): 76 def set_partitions_from_disk(self):
67 last_part = 0 77 last_part = 0
68 last_log_part = 4 78 last_log_part = 4
69 parted_part = self._parted_disk.next_partition() 79 parted_part = self._parted_disk.next_partition()
70 while parted_part: 80 while parted_part:
71 part_mb = int((parted_part.geom.end - parted_part.geom.start + 1) * self._sector_bytes / MEGABYTE) 81 part_mb = long((parted_part.geom.end - parted_part.geom.start + 1) * self._sector_bytes / MEGABYTE)
72 if parted_part.num >= 1: 82 if parted_part.num >= 1:
73 fs_type = "" 83 fs_type = ""
74 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name 84 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name
75 if parted_part.type == 2: fs_type = "extended" 85 if parted_part.type == 2: fs_type = "extended"
76 if archinfo[self._arch]['extended'] and parted_part.num > 4: 86 if archinfo[self._arch]['extended'] and parted_part.num > 4:
77 last_log_part = parted_part.num 87 last_log_part = parted_part.num
78 else: 88 else:
79 last_part = parted_part.num 89 last_part = parted_part.num
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) 90 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": 91 elif parted_part.type_name == "free":
82 parent_part = self.get_partition_at(parted_part.geom.start, ignore_extended=0) 92# parent_part = self.get_partition_at(parted_part.geom.start, ignore_extended=0)
83 if parent_part: 93# if parent_part:
94 if self.get_extended_partition() and parted_part.geom.start >= self._partitions[self.get_extended_partition()].get_start() and parted_part.geom.end <= self._partitions[self.get_extended_partition()].get_end():
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) 95 self._partitions[last_log_part+FREE_MINOR_FRAC_LOG] = Partition(self, last_log_part+FREE_MINOR_FRAC_LOG, part_mb, parted_part.geom.start, parted_part.geom.end, "free", format=False, existing=False)
85 last_log_part += 1 96 last_log_part += 1
86 else: 97 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) 98 self._partitions[last_part+FREE_MINOR_FRAC_PRI] = Partition(self, last_part+FREE_MINOR_FRAC_PRI, part_mb, parted_part.geom.start, parted_part.geom.end, "free", format=False, existing=False)
88 last_part += 1 99 last_part += 1
89 parted_part = self._parted_disk.next_partition(parted_part) 100 parted_part = self._parted_disk.next_partition(parted_part)
90 101
91 ## 102 ##
92 # Imports partition info from the install profile partition structure (currently does nothing) 103 # Imports partition info from the install profile partition structure
93 # @param ips Parameter structure returned from install_profile.get_partition_tables() 104 # @param ips Parameter structure returned from install_profile.get_partition_tables()
94 def set_partitions_from_install_profile_structure(self, ips): 105 def set_partitions_from_install_profile_structure(self, ips):
95 for part in ips: 106 for part in ips:
96 tmppart = ips[part] 107 tmppart = ips[part]
97 existing = False 108 existing = False
98 if tmppart['origminor'] and not tmppart['format']: 109 if tmppart['origminor'] and not tmppart['format']:
99 existing = True 110 existing = True
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']) 111 self._partitions[tmppart['minor']] = Partition(self, tmppart['minor'], tmppart['mb'], tmppart['start'], tmppart['end'], tmppart['type'], format=tmppart['format'], origminor=tmppart['origminor'], existing=existing, mountpoint=tmppart['mountpoint'], mountopts=tmppart['mountopts'], mkfsopts=tmppart['mkfsopts'])
101 112
102 ## 113 ##
103 # Returns name of device (e.g. /dev/hda) being represented 114 # Returns name of device (e.g. /dev/hda) being represented
104 def get_device(self): 115 def get_device(self):
105 return self._device 116 return self._device
117
118 ##
119 # Uses magic to apply the recommended partition layout
120 def do_recommended(self):
121 free_minor = 0
122 recommended_parts = [ { 'type': "ext2", 'size': 100, 'mountpoint': "/boot" },
123 { 'type': "linux-swap", 'size': 512, 'mountpoint': "" },
124 { 'type': "ext3", 'size': "*", 'mountpoint': "/" } ]
125 to_create = []
126 parts = self.get_ordered_partition_list()
127 for part in parts:
128 if self._partitions[part].get_type() == "free" and self._partitions[part].get_mb() >= 4096:
129 free_minor = part
130 break
131 if not free_minor:
132 raise GLIException("RecommendedPartitionLayoutError", "notice", "do_recommended", "You do not have atleast 4GB of concurrent unallocated space. Please remove some partitions and try again.")
133 remaining_free = self._partitions[free_minor].get_mb()
134 for newpart in recommended_parts:
135 if archinfo[self._arch]['extended'] and free_minor == (3 + FREE_MINOR_FRAC_PRI) and not newpart == recommended_parts[-1]:
136 if self.get_extended_partition():
137 raise GLIException("RecommendedPartitionLayoutError", "notice", "do_recommended", "This code is not yet robust enough to handle automatic partitioning with your current layout.")
138 to_create.append({ 'type': "extended", 'size': remaining_free, 'mountpoint': "", 'free_minor': free_minor })
139 free_minor = 4 + FREE_MINOR_FRAC_LOG
140 newpart['free_minor'] = free_minor
141 to_create.append(newpart)
142 free_minor = free_minor + 1
143 if not newpart['size'] == "*":
144 remaining_free = remaining_free - newpart['size']
145 for newpart in to_create:
146 if newpart['size'] == "*":
147 newpart['size'] = self._partitions[newpart['free_minor']].get_mb()
148 self.add_partition(newpart['free_minor'], newpart['size'], 0, 0, newpart['type'], mountpoint=newpart['mountpoint'])
106 149
107 ## 150 ##
108 # Combines free space and closes gaps in minor numbers. This is used internally 151 # Combines free space and closes gaps in minor numbers. This is used internally
109 def tidy_partitions(self): 152 def tidy_partitions(self):
110 last_minor = 0 153 last_minor = 0
116 for part in parts: 159 for part in parts:
117 if archinfo[self._arch]['extended'] and part > 4: break 160 if archinfo[self._arch]['extended'] and part > 4: break
118 tmppart = self._partitions[part] 161 tmppart = self._partitions[part]
119 if tmppart.get_type() == "extended": 162 if tmppart.get_type() == "extended":
120 for part_log in parts: 163 for part_log in parts:
121 if part_log < 4.9: continue 164 if part_log < (4 + FREE_MINOR_FRAC_LOG): continue
122 tmppart_log = self._partitions[part_log] 165 tmppart_log = self._partitions[part_log]
123 if tmppart_log.get_type() == "free": 166 if tmppart_log.get_type() == "free":
124 if last_log_minor < last_log_free: 167 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()) 168 self._partitions[last_log_free].set_mb(self._partitions[last_log_free].get_mb()+tmppart_log.get_mb())
126 del self._partitions[part_log] 169 del self._partitions[part_log]
127 else: 170 else:
128 if not last_log_free: 171 if not last_log_free:
129 last_log_free = last_log_minor + 0.9 172 last_log_free = last_log_minor + FREE_MINOR_FRAC_LOG
130 else: 173 else:
131 lost_log_free = part_log 174 last_log_free = part_log
132 tmppart_log.set_minor(last_log_free) 175 tmppart_log.set_minor(last_log_free)
133 self._partitions[last_log_free] = tmppart_log 176 self._partitions[last_log_free] = tmppart_log
134 if part_log != last_log_free: del self._partitions[part_log] 177 if part_log != last_log_free: del self._partitions[part_log]
135 continue
136 else: 178 else:
137 if part_log > (last_log_minor + 1): 179 if part_log > (last_log_minor + 1):
138 tmppart_log.set_minor(last_log_minor + 1) 180 tmppart_log.set_minor(last_log_minor + 1)
139 last_log_minor = last_log_minor + 1 181 last_log_minor = last_log_minor + 1
140 self._partitions[last_log_minor] = tmppart_log 182 self._partitions[last_log_minor] = tmppart_log
141 del self._partitions[part_log] 183 del self._partitions[part_log]
142 continue
143 else: 184 else:
144 last_log_minor = part_log 185 last_log_minor = part_log
145 if tmppart.get_type() == "free": 186 elif tmppart.get_type() == "free":
146 if last_minor < last_free: 187 if last_minor < last_free:
147 self._partitions[last_free].set_mb(self._partitions[last_free].get_mb()+tmppart.get_mb()) 188 self._partitions[last_free].set_mb(self._partitions[last_free].get_mb()+tmppart.get_mb())
148 del self._partitions[part] 189 del self._partitions[part]
149 else: 190 else:
150 if not last_free: 191 if not last_free:
151 last_free = last_minor + 0.1 192 last_free = last_minor + FREE_MINOR_FRAC_PRI
152 else: 193 else:
153 last_free = part 194 last_free = part
154 tmppart.set_minor(last_free) 195 tmppart.set_minor(last_free)
155 self._partitions[last_free] = tmppart 196 self._partitions[last_free] = tmppart
156 if part != last_free: del self._partitions[part] 197 if part != last_free: del self._partitions[part]
157 continue
158 else: 198 else:
159 if part > (last_minor + 1): 199 if part > (last_minor + 1):
160 tmppart.set_minor(last_minor + 1) 200 tmppart.set_minor(last_minor + 1)
161 last_minor = last_minor + 1 201 last_minor = last_minor + 1
162 self._partitions[last_minor] = tmppart 202 self._partitions[last_minor] = tmppart
163 del self._partitions[part] 203 del self._partitions[part]
164 continue
165 else: 204 else:
166 last_minor = part 205 last_minor = part
167 206
168 ## 207 ##
169 # Adds a new partition to the partition info 208 # Adds a new partition to the partition info
172 # @param start Start sector (only used for existing partitions) 211 # @param start Start sector (only used for existing partitions)
173 # @param end End sector (only used for existing partitions) 212 # @param end End sector (only used for existing partitions)
174 # @param type Partition type (ext2, ext3, fat32, linux-swap, free, extended, etc.) 213 # @param type Partition type (ext2, ext3, fat32, linux-swap, free, extended, etc.)
175 # @param mountpoint='' Partition mountpoint 214 # @param mountpoint='' Partition mountpoint
176 # @param mountopts='' Partition mount options 215 # @param mountopts='' Partition mount options
216 # @param mkfsopts='' Additional mkfs options
177 def add_partition(self, free_minor, mb, start, end, type, mountpoint='', mountopts=''): 217 def add_partition(self, free_minor, mb, start, end, type, mountpoint='', mountopts='',mkfsopts=''):
178 free_minor = free_minor
179 new_minor = int(free_minor) + 1 218 new_minor = int(free_minor) + 1
180# print "add_partition(): free_minor=" + str(free_minor) + ", new_minor=" + str(new_minor)
181 if self._partitions.has_key(new_minor): 219 if self._partitions.has_key(new_minor):
182 parts = self._partitions.keys() 220 parts = self._partitions.keys()
183 parts.sort() 221 parts.sort()
184 parts.reverse() 222 parts.reverse()
185 hole_at = 0 223 hole_at = 0
198 if i == new_minor: stopscooting = 1 236 if i == new_minor: stopscooting = 1
199 if mb != self._partitions[free_minor].get_mb(): 237 if mb != self._partitions[free_minor].get_mb():
200 old_free_mb = self._partitions[free_minor].get_mb() 238 old_free_mb = self._partitions[free_minor].get_mb()
201 del self._partitions[free_minor] 239 del self._partitions[free_minor]
202 if archinfo[self._arch]['extended'] and new_minor >= 5: 240 if archinfo[self._arch]['extended'] and new_minor >= 5:
203 free_minor = new_minor + 0.9 241 free_minor = new_minor + FREE_MINOR_FRAC_LOG
204 else: 242 else:
205 free_minor = new_minor + 0.1 243 free_minor = new_minor + FREE_MINOR_FRAC_PRI
206 self._partitions[free_minor] = Partition(self, free_minor, old_free_mb-mb, 0, 0, "free") 244 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: 245 else:
209 del self._partitions[free_minor] 246 del self._partitions[free_minor]
210 self._partitions[new_minor] = Partition(self, new_minor, mb, start, end, type, mountpoint=mountpoint, mountopts=mountopts) 247 self._partitions[new_minor] = Partition(self, new_minor, mb, start, end, type, mountpoint=mountpoint, mountopts=mountopts,mkfsopts=mkfsopts)
211 if type == "extended": 248 if type == "extended":
212 self._partitions[4.9] = Partition(self, 4.9, mb, 0, 0, "free") 249 self._partitions[4 + FREE_MINOR_FRAC_LOG] = Partition(self, (4 + FREE_MINOR_FRAC_LOG), mb, 0, 0, "free")
213 self.tidy_partitions() 250 self.tidy_partitions()
214 251
215 ## 252 ##
216 # Removes partition from partition info 253 # Removes partition from partition info
217 # @param minor Minor of partition to remove 254 # @param minor Minor of partition to remove
218 def remove_partition(self, minor): 255 def remove_partition(self, minor):
219 tmppart = self._partitions[int(minor)] 256 tmppart = self._partitions[int(minor)]
220 free_minor = 0 257 free_minor = 0
221 if tmppart.is_logical(): 258 if tmppart.is_logical():
222 free_minor = minor-0.1 259 free_minor = int(minor-1)+FREE_MINOR_FRAC_LOG
223 else: 260 else:
224 free_minor = minor-0.9 261 free_minor = int(minor-1)+FREE_MINOR_FRAC_PRI
262 if free_minor in self._partitions:
263 self._partitions[free_minor].set_mb(self._partitions[free_minor].get_mb() + tmppart.get_mb())
264 else:
225 self._partitions[free_minor] = Partition(self, free_minor, tmppart.get_mb(), 0, 0, "free", format=False, existing=False) 265 self._partitions[free_minor] = Partition(self, free_minor, tmppart.get_mb(), 0, 0, "free", format=False, existing=False)
226 del self._partitions[int(minor)] 266 del self._partitions[int(minor)]
227 self.tidy_partitions() 267 self.tidy_partitions()
228 268
229 ## 269 ##
230 # Returns free space (no longer used) 270 # This function clears the partition table
231 # @param start Start sector for search 271 def clear_partitions(self):
232 def get_free_space(self, start): 272# parts = self._partitions.keys()
233 GAP_SIZE = 100 273# parts.sort()
274# parts.reverse()
275# for part in parts:
276# if not self._partitions[part].get_type() == "free":
277# self.remove_partition(part)
278 self._partitions = { (0 + FREE_MINOR_FRAC_PRI): Partition(self, (0 + FREE_MINOR_FRAC_PRI), self.get_total_mb(), 0, 0, "free", format=False, existing=False) }
279
280 ##
281 # Returns an ordered list (disk order) of partition minors
282 def get_ordered_partition_list(self):
234 parts = self._partitions.keys() 283 parts = self._partitions.keys()
235 parts.sort() 284 parts.sort()
236 lastend_pri = 0 285 partlist = []
237 lastend_log = 0
238 free_start = -1
239 free_end = -1
240 if start > self._total_sectors: return (-1, -1)
241 for part in parts:
242 if part > 4: break
243 tmppart = self._partitions[part]
244 if (tmppart.get_start() > (lastend_pri + GAP_SIZE)) and (lastend_pri >= start):
245 free_start = lastend_pri
246 free_end = tmppart.get_start() - 1
247 break
248 if tmppart.is_extended() and start < tmppart.get_end():
249 lastend_log = tmppart.get_start()
250 for part_log in parts:
251 if part_log < 5: continue
252 tmppart_log = self._partitions[part_log]
253 if (tmppart_log.get_start() > (lastend_log + GAP_SIZE)) and (lastend_log >= start):
254 free_start = lastend_log
255 free_end = tmppart_log.get_start() - 1
256 break
257 lastend_log = tmppart_log.get_end() + 1
258 if free_start == -1 and lastend_log < tmppart.get_end():
259 free_start = lastend_log
260 free_end = tmppart.get_end()
261 break
262 lastend_pri = tmppart.get_end() + 1
263 if free_start == -1 and lastend_pri < self._total_sectors:
264 free_start = lastend_pri
265 free_end = self._total_sectors
266 return (free_start, free_end)
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
272 def get_partition_at(self, sector, ignore_extended=1):
273 parts = self._partitions.keys()
274 parts.sort()
275 for part in parts:
276 tmppart = self._partitions[part]
277 if ignore_extended and tmppart.is_extended(): continue
278 if (sector >= tmppart.get_start()) and (sector <= tmppart.get_end()):
279 return part
280 return 0
281
282 ##
283 # Returns free minor (no longer used)
284 # @param start Parameter description
285 # @param end Parameter description
286 def get_free_minor_at(self, start, end):
287 parts = self._partitions.keys()
288 parts.sort()
289 minor = 1
290 lastpart = 0
291 for part in parts:
292 if part > 4: break
293 tmppart = self._partitions[part]
294 if end < tmppart.get_start():
295 minor = part
296 if (minor - 1) > lastpart: minor = lastpart + 1
297 break
298 if tmppart.is_extended() and start < tmppart.get_end():
299 minor = 5
300 lastpart = 4
301 for part_log in parts:
302 if part_log < 5: continue
303 tmppart_log = self._partitions[part_log]
304 if end < tmppart_log.get_start():
305 minor = part_log
306 if (minor - 1) > lastpart: minor = lastpart + 1
307 break
308 minor = part_log + 1
309 lastpart = part_log
310 break
311 minor = part + 1
312 lastpart = part
313 return minor
314
315 ##
316 # Returns an ordered list (disk order) of partition minors
317 def get_ordered_partition_list(self):
318 parts = self._partitions.keys()
319 parts.sort()
320 partlist = []
321 tmppart = None 286 tmppart = None
322 for part in parts: 287 for part in parts:
323 if archinfo[self._arch]['extended'] and part > 4.1: break 288 if archinfo[self._arch]['extended'] and part > (4 + FREE_MINOR_FRAC_PRI): break
324 tmppart = self._partitions[part] 289 tmppart = self._partitions[part]
325 partlist.append(part) 290 partlist.append(part)
326 if tmppart.is_extended(): 291 if tmppart.is_extended():
327 for part_log in parts: 292 for part_log in parts:
328 if part_log < 4.9: continue 293 if part_log < (4 + FREE_MINOR_FRAC_LOG): continue
329 partlist.append(part_log) 294 partlist.append(part_log)
330 return partlist 295 return partlist
331 296
332 ## 297 ##
333 # Returns partition info in a format suitable for passing to install_profile.set_partition_tables() 298 # Returns partition info in a format suitable for passing to install_profile.set_partition_tables()
334 def get_install_profile_structure(self): 299 def get_install_profile_structure(self):
335 devdic = {} 300 devdic = {}
336 for part in self._partitions: 301 for part in self._partitions:
337 tmppart = self._partitions[part] 302 tmppart = self._partitions[part]
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() } 303 devdic[part] = { 'mb': tmppart.get_mb(), 'minor': float(part), 'origminor': tmppart.get_orig_minor(), 'type': tmppart.get_type(), 'mountpoint': tmppart.get_mountpoint(), 'mountopts': tmppart.get_mountopts(), 'format': tmppart.get_format(), 'mkfsopts': tmppart.get_mkfsopts(), 'start': 0, 'end': 0 }
339 return devdic 304 return devdic
340 305
341 ## 306 ##
342 # Returns the minor of the extended partition, if any 307 # Returns the minor of the extended partition, if any
343 def get_extended_partition(self): 308 def get_extended_partition(self):
346 if tmppart.is_extended(): 311 if tmppart.is_extended():
347 return part 312 return part
348 return 0 313 return 0
349 314
350 ## 315 ##
316 # Returns the drive model
317 def get_model(self):
318 return self._parted_dev.model
319
320 ##
351 # Sets the disklabel type 321 # Sets the disklabel type
352 def set_disklabel(self, disklabel): 322 def set_disklabel(self, disklabel):
353 self._disklabel = disklabel 323 self._disklabel = disklabel
354 324
355 ## 325 ##
358 return self._disklabel 328 return self._disklabel
359 329
360 ## 330 ##
361 # Returns the number of sectors on the device 331 # Returns the number of sectors on the device
362 def get_num_sectors(self): 332 def get_num_sectors(self):
363 return int(self._total_sectors) 333 return long(self._total_sectors)
364 334
365 ## 335 ##
366 # Returns the size of a cylinder in bytes 336 # Returns the size of a cylinder in bytes
367 def get_cylinder_size(self): 337 def get_cylinder_size(self):
368 return int(self._cylinder_bytes) 338 return long(self._cylinder_bytes)
369 339
370 ## 340 ##
371 # Returns the size of a sector in bytes 341 # Returns the size of a sector in bytes
372 def get_sector_size(self): 342 def get_sector_size(self):
373 return int(self._sector_bytes) 343 return long(self._sector_bytes)
374 344
375 ## 345 ##
376 # Returns the number of cylinders 346 # Returns the number of cylinders
377 def get_num_cylinders(self): 347 def get_num_cylinders(self):
378 return int(self._geometry['cylinders']) 348 return long(self._geometry['cylinders'])
379 349
380 ## 350 ##
381 # Returns the total number of bytes on the device 351 # Returns the total number of bytes on the device
382 def get_drive_bytes(self): 352 def get_drive_bytes(self):
383 return int(self._total_bytes) 353 return long(self._total_bytes)
384 354
385 ## 355 ##
386 # Returns the total number of MB on the device 356 # Returns the total number of MB on the device
387 def get_total_mb(self): 357 def get_total_mb(self):
388 return self._total_mb 358 return self._total_mb
394 364
395 ## 365 ##
396 # Prints disk geometry to STDOUT (no longer used) 366 # Prints disk geometry to STDOUT (no longer used)
397 def print_geometry(self): 367 def print_geometry(self):
398 print self._total_bytes, self._geometry 368 print self._total_bytes, self._geometry
399
400 ##
401 # Utility function for running a command and returning it's output as a list
402 # @param cmd Command to run
403 def _run(self, cmd):
404 "Runs a command and returns the output"
405
406 # Run command
407 output_string = commands.getoutput(cmd)
408
409 # What we will return
410 output_list = []
411
412 # As long as there is a new line in the output_string
413 while output_string.find("\n") != -1:
414
415 # Find the \n in the string
416 index = output_string.find("\n") + 1
417
418 # Add the line to the output and remove it from
419 # the output_string
420 output_list.append(output_string[:index])
421 output_string = output_string[index:]
422
423 # return output
424 return output_list
425 369
426## 370##
427# This class represents a partition within a GLIStorageDevice object 371# This class represents a partition within a GLIStorageDevice object
428class Partition: 372class Partition:
429 "Class representing a single partition within a Device object" 373 "Class representing a single partition within a Device object"
438 _mountopts = None 382 _mountopts = None
439 _format = None 383 _format = None
440 _resizeable = None 384 _resizeable = None
441 _min_mb_for_resize = 0 385 _min_mb_for_resize = 0
442 _mb = 0 386 _mb = 0
387 _mkfsopts = None
443 388
444 ## 389 ##
445 # Initialization function for the Partition class 390 # Initialization function for the Partition class
446 # @param device Parent GLIStorageDevice object 391 # @param device Parent GLIStorageDevice object
447 # @param minor Minor of partition 392 # @param minor Minor of partition
449 # @param start Parameter Start sector of partition 394 # @param start Parameter Start sector of partition
450 # @param end Parameter Start sector of partition 395 # @param end Parameter Start sector of partition
451 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.) 396 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.)
452 # @param mountpoint='' Mountpoint of partition 397 # @param mountpoint='' Mountpoint of partition
453 # @param mountopts='' Mount options of partition 398 # @param mountopts='' Mount options of partition
399 # @param mkfsopts='' Additional mkfs options
454 # @param format=True Format partition 400 # @param format=True Format partition
455 # @param existing=False This partition exists on disk 401 # @param existing=False This partition exists on disk
456 def __init__(self, device, minor, mb, start, end, type, mountpoint='', mountopts='', format=True, existing=False, origminor=0): 402 def __init__(self, device, minor, mb, start, end, type, mountpoint='', mountopts='', format=True, existing=False, origminor=0, mkfsopts=''):
457 self._device = device 403 self._device = device
458 self._minor = float(minor) 404 self._minor = float(minor)
459 self._start = int(start) 405 self._start = long(start)
460 self._end = int(end) 406 self._end = long(end)
461 self._type = type or "unknown" 407 self._type = type or "unknown"
462 self._mountpoint = mountpoint 408 self._mountpoint = mountpoint
463 self._mountopts = mountopts 409 self._mountopts = mountopts
464 self._format = format 410 self._format = format
465 self._mb = mb 411 self._mb = mb
466 self._orig_minor = origminor 412 self._orig_minor = origminor
413 self._mkfsopts = mkfsopts
467 if type != "free": 414 if type != "free":
468 if existing and not origminor: 415 if existing and not origminor:
469 self._orig_minor = self._minor 416 self._orig_minor = self._minor
470 self._minor = int(self._minor) 417 self._minor = int(self._minor)
471 self._orig_minor = int(self._orig_minor) 418 self._orig_minor = int(self._orig_minor)
472 if existing: 419 if existing:
420 try:
473 parted_part = device._parted_disk.get_partition(self._orig_minor) 421 parted_part = device._parted_disk.get_partition(self._orig_minor)
474 label_type = device._parted_disk.type.name 422 label_type = device._parted_disk.type.name
475 if label_type == "loop": 423 if label_type == "loop":
476 dev_node = device._device 424 dev_node = device._device
477 else: 425 else:
478 dev_node = device._device + str(self._orig_minor) 426 dev_node = device._device + str(self._orig_minor)
479 print "dev_node = " + dev_node 427# print "dev_node = " + dev_node
480 if type == "ntfs": 428 if type == "ntfs":
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 .\+//'")) 429 min_bytes = long(commands.getoutput("ntfsresize -f --info " + dev_node + " | grep -e '^You might resize' | sed -e 's/You might resize at //' -e 's/ bytes or .\+//'"))
482 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1 430 self._min_mb_for_resize = long(min_bytes / MEGABYTE) + 1
483 self._resizeable = True 431 self._resizeable = True
484 elif type == "ext2" or type == "ext3": 432 elif type == "ext2" or type == "ext3":
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\+//'"))) 433 block_size = long(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Block size:' | sed -e 's/^Block size:\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\+//'"))) 434 free_blocks = long(string.strip(commands.getoutput("dumpe2fs -h " + dev_node + r" 2>&1 | grep -e '^Free blocks:' | sed -e 's/^Free blocks:\s\+//'")))
487 free_bytes = int(block_size * free_blocks) 435 free_bytes = long(block_size * free_blocks)
488 # can't hurt to pad (the +50) it a bit since this is really just a guess 436 # can't hurt to pad (the +50) it a bit since this is really just a guess
489 self._min_mb_for_resize = self._mb - int(free_bytes / MEGABYTE) + 50 437 self._min_mb_for_resize = self._mb - long(free_bytes / MEGABYTE) + 50
490 self._resizeable = True 438 self._resizeable = True
491 else: 439 else:
492 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor)) 440 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor))
493 try:
494 parted_fs = parted_part.geom.file_system_open() 441 parted_fs = parted_part.geom.file_system_open()
495 except:
496 self._resizeable = False
497 return
498 resize_constraint = parted_fs.get_resize_constraint() 442 resize_constraint = parted_fs.get_resize_constraint()
499 min_bytes = resize_constraint.min_size * self._device._sector_bytes 443 min_bytes = resize_constraint.min_size * self._device._sector_bytes
500 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1 444 self._min_mb_for_resize = long(min_bytes / MEGABYTE) + 1
501 self._resizeable = True 445 self._resizeable = True
446 except:
447 self._resizeable = False
502 448
503 ## 449 ##
504 # Returns whether or not the partition is extended 450 # Returns whether or not the partition is extended
505 def is_extended(self): 451 def is_extended(self):
506 if self._type == "extended": 452 if self._type == "extended":
510 456
511 ## 457 ##
512 # Returns whether or not the partition is logical 458 # Returns whether or not the partition is logical
513 def is_logical(self): 459 def is_logical(self):
514 if self._type == "free": 460 if self._type == "free":
515 if int(self._minor) + 0.9 == self._minor: 461 if int(self._minor) + FREE_MINOR_FRAC_LOG == self._minor:
516 return True 462 return True
517 else: 463 else:
518 return False 464 return False
519 elif archinfo[self._device._arch]['extended'] and self._minor > 4: 465 elif archinfo[self._device._arch]['extended'] and self._minor > 4:
520 return True 466 return True
542 return None 488 return None
543 else: 489 else:
544 return self._device.get_partition_at(self._start, ignore_extended=0) 490 return self._device.get_partition_at(self._start, ignore_extended=0)
545 491
546 ## 492 ##
493 # Sets the options passed to mkfs
494 # @param mkfsopts Options passed to mkfs
495 def set_mkfsopts(self, mkfsopts):
496 self._mkfsopts = mkfsopts
497
498 ##
499 # Returns the options passes to mkfs
500 def get_mkfsopts(self):
501 return self._mkfsopts
502
503 ##
547 # Sets the start sector for the partition 504 # Sets the start sector for the partition
548 # @param start Start sector 505 # @param start Start sector
549 def set_start(self, start): 506 def set_start(self, start):
550 self._start = int(start) 507 self._start = long(start)
551 508
552 ## 509 ##
553 # Returns the start sector for the partition 510 # Returns the start sector for the partition
554 def get_start(self): 511 def get_start(self):
555 return int(self._start) 512 return long(self._start)
556 513
557 ## 514 ##
558 # Sets the end sector of the partition 515 # Sets the end sector of the partition
559 # @param end End sector 516 # @param end End sector
560 def set_end(self, end): 517 def set_end(self, end):
561 self._end = int(end) 518 self._end = long(end)
562 519
563 ## 520 ##
564 # Returns end sector for the partition 521 # Returns end sector for the partition
565 def get_end(self): 522 def get_end(self):
566 return int(self._end) 523 return long(self._end)
567 524
568 ## 525 ##
569 # Returns size of partition in MB 526 # Returns size of partition in MB
570 def get_mb(self): 527 def get_mb(self):
571 return int(self._mb) 528 return long(self._mb)
572 529
573 ## 530 ##
574 # Sets size of partition in MB 531 # Sets size of partition in MB
575 # @param mb Parameter description 532 # @param mb Parameter description
576 def set_mb(self, mb): 533 def set_mb(self, mb):
577 self._mb = int(mb) 534 self._mb = long(mb)
578 535
579 ## 536 ##
580 # Sets type of partition 537 # Sets type of partition
581 # @param type Parameter description 538 # @param type Parameter description
582 def set_type(self, type): 539 def set_type(self, type):
671 # Returns maximum MB for resize 628 # Returns maximum MB for resize
672 def get_max_mb_for_resize(self): 629 def get_max_mb_for_resize(self):
673 if self._resizeable: 630 if self._resizeable:
674 free_minor = 0 631 free_minor = 0
675 if self.is_logical(): 632 if self.is_logical():
676 free_minor = self._minor + 0.9 633 free_minor = self._minor + FREE_MINOR_FRAC_LOG
677 else: 634 else:
678 free_minor = self._minor + 0.1 635 free_minor = self._minor + FREE_MINOR_FRAC_PRI
679 if free_minor in self._device._partitions: 636 if free_minor in self._device._partitions:
680 return self._mb + self._device._partitions[free_minor]._mb 637 return self._mb + self._device._partitions[free_minor]._mb
681 else: 638 else:
682 return self._mb 639 return self._mb
683 else: 640 else:
687 # Resizes the partition 644 # Resizes the partition
688 # @param mb New size in MB 645 # @param mb New size in MB
689 def resize(self, mb): 646 def resize(self, mb):
690 free_minor = self._minor 647 free_minor = self._minor
691 if self.is_logical(): 648 if self.is_logical():
692 free_minor += 0.9 649 free_minor += FREE_MINOR_FRAC_LOG
693 else: 650 else:
694 free_minor += 0.1 651 free_minor += FREE_MINOR_FRAC_PRI
695 if mb < self._mb: 652 if mb < self._mb:
696 # Shrinking 653 # Shrinking
697 if not free_minor in self._device._partitions: 654 if not free_minor in self._device._partitions:
698 self._device._partitions[free_minor] = Partition(self._device, free_minor, 0, 0, 0, "free", format=False, existing=False) 655 self._device._partitions[free_minor] = Partition(self._device, free_minor, 0, 0, 0, "free", format=False, existing=False)
699 self._device._partitions[free_minor]._mb += self._mb - mb 656 self._device._partitions[free_minor]._mb += self._mb - mb
711# Returns a list of detected partitionable devices 668# Returns a list of detected partitionable devices
712def detect_devices(): 669def detect_devices():
713 devices = [] 670 devices = []
714 671
715 # Make sure sysfs exists 672 # Make sure sysfs exists
673 # TODO: rewrite for 2.4 support
716 if not os.path.exists("/sys/bus"): 674 if not os.path.exists("/sys/bus"):
717 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)") 675 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)")
718 # Make sure /proc/partitions exists 676 # Make sure /proc/partitions exists
719 if not os.path.exists("/proc/partitions"): 677 if not os.path.exists("/proc/partitions"):
720 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "/proc/partitions does not exist! Please make sure procfs is in your kernel and mounted!") 678 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "/proc/partitions does not exist! Please make sure procfs is in your kernel and mounted!")
757 715
758 partitions.append(( major, minor, device )) 716 partitions.append(( major, minor, device ))
759 717
760 # Scan sysfs for the devices of type 'x' 718 # Scan sysfs for the devices of type 'x'
761 # 'x' being a member of the list below: 719 # 'x' being a member of the list below:
720 # TODO: rewrite for 2.4 support
762 for dev_type in [ "ide", "scsi" ]: # Other device types? usb? fw? 721 for dev_type in [ "ide", "scsi" ]: # Other device types? usb? fw?
763 if os.path.exists("/sys/bus/" + dev_type): 722 if os.path.exists("/sys/bus/" + dev_type):
764 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices") 723 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices")
765 724
766 # For each device in the devices on that bus 725 # For each device in the devices on that bus

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

  ViewVC Help
Powered by ViewVC 1.1.20