/[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 1037
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, local_device=True):
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
43 self._arch = arch 53 self._arch = arch
54 self._local_device = local_device
55 if self._local_device:
44 self._parted_dev = parted.PedDevice.get(self._device) 56 self._parted_dev = parted.PedDevice.get(self._device)
45 try: 57 try:
46 self._parted_disk = parted.PedDisk.new(self._parted_dev) 58 self._parted_disk = parted.PedDisk.new(self._parted_dev)
47 except: 59 except:
48 self._parted_disk = self._parted_dev.disk_new_fresh(parted.disk_type_get(archinfo[self._arch]['disklabel'])) 60 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 61 self._disklabel = self._parted_disk.type.name
50 if set_geometry: 62 if set_geometry:
51 self.set_disk_geometry_from_disk() 63 self.set_disk_geometry_from_disk()
52 64
53 ## 65 ##
57 self._geometry['heads'], self._geometry['sectors'], self._geometry['cylinders'] = self._parted_dev.heads, self._parted_dev.sectors, self._parted_dev.cylinders 69 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 70 self._sector_bytes = self._parted_dev.sector_size
59 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes 71 self._cylinder_bytes = self._geometry['heads'] * self._geometry['sectors'] * self._sector_bytes
60 self._total_sectors = self._parted_dev.length 72 self._total_sectors = self._parted_dev.length
61 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors'] 73 self._sectors_in_cylinder = self._geometry['heads'] * self._geometry['sectors']
62 self._total_mb = int(self._total_bytes / MEGABYTE) 74 self._total_mb = long(self._total_bytes / MEGABYTE)
63 75
64 ## 76 ##
65 # Sets partition info from disk. 77 # Sets partition info from disk.
66 def set_partitions_from_disk(self): 78 def set_partitions_from_disk(self):
67 last_part = 0 79 last_part = 0
68 last_log_part = 4 80 last_log_part = 4
69 parted_part = self._parted_disk.next_partition() 81 parted_part = self._parted_disk.next_partition()
70 while parted_part: 82 while parted_part:
71 part_mb = int((parted_part.geom.end - parted_part.geom.start + 1) * self._sector_bytes / MEGABYTE) 83 part_mb = long((parted_part.geom.end - parted_part.geom.start + 1) * self._sector_bytes / MEGABYTE)
72 if parted_part.num >= 1: 84 if parted_part.num >= 1:
73 fs_type = "" 85 fs_type = ""
74 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name 86 if parted_part.fs_type != None: fs_type = parted_part.fs_type.name
75 if parted_part.type == 2: fs_type = "extended" 87 if parted_part.type == 2: fs_type = "extended"
76 if archinfo[self._arch]['extended'] and parted_part.num > 4: 88 if archinfo[self._arch]['extended'] and parted_part.num > 4:
77 last_log_part = parted_part.num 89 last_log_part = parted_part.num
78 else: 90 else:
79 last_part = parted_part.num 91 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) 92 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": 93 elif parted_part.type_name == "free":
82 parent_part = self.get_partition_at(parted_part.geom.start, ignore_extended=0) 94# parent_part = self.get_partition_at(parted_part.geom.start, ignore_extended=0)
83 if parent_part: 95# if parent_part:
96 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) 97 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 98 last_log_part += 1
86 else: 99 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) 100 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 101 last_part += 1
89 parted_part = self._parted_disk.next_partition(parted_part) 102 parted_part = self._parted_disk.next_partition(parted_part)
90 103
91 ## 104 ##
92 # Imports partition info from the install profile partition structure (currently does nothing) 105 # Imports partition info from the install profile partition structure
93 # @param ips Parameter structure returned from install_profile.get_partition_tables() 106 # @param ips Parameter structure returned from install_profile.get_partition_tables()
94 def set_partitions_from_install_profile_structure(self, ips): 107 def set_partitions_from_install_profile_structure(self, ips):
95 for part in ips: 108 for part in ips:
96 tmppart = ips[part] 109 tmppart = ips[part]
97 existing = False 110 existing = False
98 if tmppart['origminor'] and not tmppart['format']: 111 if tmppart['origminor'] and not tmppart['format']:
99 existing = True 112 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']) 113 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 114
102 ## 115 ##
103 # Returns name of device (e.g. /dev/hda) being represented 116 # Returns name of device (e.g. /dev/hda) being represented
104 def get_device(self): 117 def get_device(self):
105 return self._device 118 return self._device
119
120 ##
121 # Uses magic to apply the recommended partition layout
122 def do_recommended(self):
123 free_minor = 0
124 recommended_parts = [ { 'type': "ext2", 'size': 100, 'mountpoint': "/boot" },
125 { 'type': "linux-swap", 'size': 512, 'mountpoint': "" },
126 { 'type': "ext3", 'size': "*", 'mountpoint': "/" } ]
127 to_create = []
128 physical_memory = int(GLIUtility.spawn(r"free -m | egrep '^Mem:' | sed -e 's/^Mem: \+//' -e 's/ \+.\+$//'", return_output=True)[1].strip())
129 parts = self.get_ordered_partition_list()
130 for part in parts:
131 if self._partitions[part].get_type() == "free" and self._partitions[part].get_mb() >= 4096:
132 free_minor = part
133 break
134 if not free_minor:
135 raise GLIException("RecommendedPartitionLayoutError", "notice", "do_recommended", "You do not have atleast 4GB of concurrent unallocated space. Please remove some partitions and try again.")
136 remaining_free = self._partitions[free_minor].get_mb()
137 for newpart in recommended_parts:
138 if archinfo[self._arch]['extended'] and free_minor == (3 + FREE_MINOR_FRAC_PRI) and not newpart == recommended_parts[-1]:
139 if self.get_extended_partition():
140 raise GLIException("RecommendedPartitionLayoutError", "notice", "do_recommended", "This code is not yet robust enough to handle automatic partitioning with your current layout.")
141 to_create.append({ 'type': "extended", 'size': remaining_free, 'mountpoint': "", 'free_minor': free_minor })
142 free_minor = 4 + FREE_MINOR_FRAC_LOG
143 newpart['free_minor'] = free_minor
144 if newpart['type'] == "linux-swap" and physical_memory and physical_memory < 1024:
145 newpart['size'] = physical_memory * 2
146 to_create.append(newpart)
147 free_minor = free_minor + 1
148 if not newpart['size'] == "*":
149 remaining_free = remaining_free - newpart['size']
150 for newpart in to_create:
151 if newpart['size'] == "*":
152 newpart['size'] = self._partitions[newpart['free_minor']].get_mb()
153 self.add_partition(newpart['free_minor'], newpart['size'], 0, 0, newpart['type'], mountpoint=newpart['mountpoint'])
106 154
107 ## 155 ##
108 # Combines free space and closes gaps in minor numbers. This is used internally 156 # Combines free space and closes gaps in minor numbers. This is used internally
109 def tidy_partitions(self): 157 def tidy_partitions(self):
110 last_minor = 0 158 last_minor = 0
116 for part in parts: 164 for part in parts:
117 if archinfo[self._arch]['extended'] and part > 4: break 165 if archinfo[self._arch]['extended'] and part > 4: break
118 tmppart = self._partitions[part] 166 tmppart = self._partitions[part]
119 if tmppart.get_type() == "extended": 167 if tmppart.get_type() == "extended":
120 for part_log in parts: 168 for part_log in parts:
121 if part_log < 4.9: continue 169 if part_log < (4 + FREE_MINOR_FRAC_LOG): continue
122 tmppart_log = self._partitions[part_log] 170 tmppart_log = self._partitions[part_log]
123 if tmppart_log.get_type() == "free": 171 if tmppart_log.get_type() == "free":
124 if last_log_minor < last_log_free: 172 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()) 173 self._partitions[last_log_free].set_mb(self._partitions[last_log_free].get_mb()+tmppart_log.get_mb())
126 del self._partitions[part_log] 174 del self._partitions[part_log]
127 else: 175 else:
128 if not last_log_free: 176 if not last_log_free:
129 last_log_free = last_log_minor + 0.9 177 last_log_free = last_log_minor + FREE_MINOR_FRAC_LOG
130 else: 178 else:
131 lost_log_free = part_log 179 last_log_free = part_log
132 tmppart_log.set_minor(last_log_free) 180 tmppart_log.set_minor(last_log_free)
133 self._partitions[last_log_free] = tmppart_log 181 self._partitions[last_log_free] = tmppart_log
134 if part_log != last_log_free: del self._partitions[part_log] 182 if part_log != last_log_free: del self._partitions[part_log]
135 continue
136 else: 183 else:
137 if part_log > (last_log_minor + 1): 184 if part_log > (last_log_minor + 1):
138 tmppart_log.set_minor(last_log_minor + 1) 185 tmppart_log.set_minor(last_log_minor + 1)
139 last_log_minor = last_log_minor + 1 186 last_log_minor = last_log_minor + 1
140 self._partitions[last_log_minor] = tmppart_log 187 self._partitions[last_log_minor] = tmppart_log
141 del self._partitions[part_log] 188 del self._partitions[part_log]
142 continue
143 else: 189 else:
144 last_log_minor = part_log 190 last_log_minor = part_log
145 if tmppart.get_type() == "free": 191 elif tmppart.get_type() == "free":
146 if last_minor < last_free: 192 if last_minor < last_free:
147 self._partitions[last_free].set_mb(self._partitions[last_free].get_mb()+tmppart.get_mb()) 193 self._partitions[last_free].set_mb(self._partitions[last_free].get_mb()+tmppart.get_mb())
148 del self._partitions[part] 194 del self._partitions[part]
149 else: 195 else:
150 if not last_free: 196 if not last_free:
151 last_free = last_minor + 0.1 197 last_free = last_minor + FREE_MINOR_FRAC_PRI
152 else: 198 else:
153 last_free = part 199 last_free = part
154 tmppart.set_minor(last_free) 200 tmppart.set_minor(last_free)
155 self._partitions[last_free] = tmppart 201 self._partitions[last_free] = tmppart
156 if part != last_free: del self._partitions[part] 202 if part != last_free: del self._partitions[part]
157 continue
158 else: 203 else:
159 if part > (last_minor + 1): 204 if part > (last_minor + 1):
160 tmppart.set_minor(last_minor + 1) 205 tmppart.set_minor(last_minor + 1)
161 last_minor = last_minor + 1 206 last_minor = last_minor + 1
162 self._partitions[last_minor] = tmppart 207 self._partitions[last_minor] = tmppart
163 del self._partitions[part] 208 del self._partitions[part]
164 continue
165 else: 209 else:
166 last_minor = part 210 last_minor = part
167 211
168 ## 212 ##
169 # Adds a new partition to the partition info 213 # Adds a new partition to the partition info
172 # @param start Start sector (only used for existing partitions) 216 # @param start Start sector (only used for existing partitions)
173 # @param end End sector (only used for existing partitions) 217 # @param end End sector (only used for existing partitions)
174 # @param type Partition type (ext2, ext3, fat32, linux-swap, free, extended, etc.) 218 # @param type Partition type (ext2, ext3, fat32, linux-swap, free, extended, etc.)
175 # @param mountpoint='' Partition mountpoint 219 # @param mountpoint='' Partition mountpoint
176 # @param mountopts='' Partition mount options 220 # @param mountopts='' Partition mount options
221 # @param mkfsopts='' Additional mkfs options
177 def add_partition(self, free_minor, mb, start, end, type, mountpoint='', mountopts=''): 222 def add_partition(self, free_minor, mb, start, end, type, mountpoint='', mountopts='',mkfsopts=''):
178 free_minor = free_minor 223 if free_minor == -1:
224 tmpparts = self._partitions.keys()
225 tmpparts.sort()
226 tmpminor = tmpparts[-1]
227 if archinfo[self._arch]['extended'] and tmpminor >= 5:
228 free_minor = new_minor + FREE_MINOR_FRAC_LOG
229 else:
230 free_minor = new_minor + FREE_MINOR_FRAC_PRI
231 self._partitions[free_minor] = Partition(self, free_minor, mb, 0, 0, "free")
179 new_minor = int(free_minor) + 1 232 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): 233 if self._partitions.has_key(new_minor):
182 parts = self._partitions.keys() 234 parts = self._partitions.keys()
183 parts.sort() 235 parts.sort()
184 parts.reverse() 236 parts.reverse()
185 hole_at = 0 237 hole_at = 0
198 if i == new_minor: stopscooting = 1 250 if i == new_minor: stopscooting = 1
199 if mb != self._partitions[free_minor].get_mb(): 251 if mb != self._partitions[free_minor].get_mb():
200 old_free_mb = self._partitions[free_minor].get_mb() 252 old_free_mb = self._partitions[free_minor].get_mb()
201 del self._partitions[free_minor] 253 del self._partitions[free_minor]
202 if archinfo[self._arch]['extended'] and new_minor >= 5: 254 if archinfo[self._arch]['extended'] and new_minor >= 5:
203 free_minor = new_minor + 0.9 255 free_minor = new_minor + FREE_MINOR_FRAC_LOG
204 else: 256 else:
205 free_minor = new_minor + 0.1 257 free_minor = new_minor + FREE_MINOR_FRAC_PRI
206 self._partitions[free_minor] = Partition(self, free_minor, old_free_mb-mb, 0, 0, "free") 258 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: 259 else:
209 del self._partitions[free_minor] 260 del self._partitions[free_minor]
210 self._partitions[new_minor] = Partition(self, new_minor, mb, start, end, type, mountpoint=mountpoint, mountopts=mountopts) 261 self._partitions[new_minor] = Partition(self, new_minor, mb, start, end, type, mountpoint=mountpoint, mountopts=mountopts,mkfsopts=mkfsopts)
211 if type == "extended": 262 if type == "extended":
212 self._partitions[4.9] = Partition(self, 4.9, mb, 0, 0, "free") 263 self._partitions[4 + FREE_MINOR_FRAC_LOG] = Partition(self, (4 + FREE_MINOR_FRAC_LOG), mb, 0, 0, "free")
213 self.tidy_partitions() 264 self.tidy_partitions()
214 265
215 ## 266 ##
216 # Removes partition from partition info 267 # Removes partition from partition info
217 # @param minor Minor of partition to remove 268 # @param minor Minor of partition to remove
218 def remove_partition(self, minor): 269 def remove_partition(self, minor):
219 tmppart = self._partitions[int(minor)] 270 tmppart = self._partitions[int(minor)]
220 free_minor = 0 271 free_minor = 0
221 if tmppart.is_logical(): 272 if tmppart.is_logical():
222 free_minor = minor-0.1 273 free_minor = int(minor-1)+FREE_MINOR_FRAC_LOG
223 else: 274 else:
224 free_minor = minor-0.9 275 free_minor = int(minor-1)+FREE_MINOR_FRAC_PRI
276 if free_minor in self._partitions:
277 self._partitions[free_minor].set_mb(self._partitions[free_minor].get_mb() + tmppart.get_mb())
278 else:
225 self._partitions[free_minor] = Partition(self, free_minor, tmppart.get_mb(), 0, 0, "free", format=False, existing=False) 279 self._partitions[free_minor] = Partition(self, free_minor, tmppart.get_mb(), 0, 0, "free", format=False, existing=False)
226 del self._partitions[int(minor)] 280 del self._partitions[int(minor)]
227 self.tidy_partitions() 281 self.tidy_partitions()
228 282
229 ## 283 ##
230 # Returns free space (no longer used) 284 # This function clears the partition table
231 # @param start Start sector for search 285 def clear_partitions(self):
232 def get_free_space(self, start): 286# parts = self._partitions.keys()
233 GAP_SIZE = 100 287# parts.sort()
288# parts.reverse()
289# for part in parts:
290# if not self._partitions[part].get_type() == "free":
291# self.remove_partition(part)
292 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) }
293
294 ##
295 # Returns an ordered list (disk order) of partition minors
296 def get_ordered_partition_list(self):
234 parts = self._partitions.keys() 297 parts = self._partitions.keys()
235 parts.sort() 298 parts.sort()
236 lastend_pri = 0 299 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 300 tmppart = None
322 for part in parts: 301 for part in parts:
323 if archinfo[self._arch]['extended'] and part > 4.1: break 302 if archinfo[self._arch]['extended'] and part > (4 + FREE_MINOR_FRAC_PRI): break
324 tmppart = self._partitions[part] 303 tmppart = self._partitions[part]
325 partlist.append(part) 304 partlist.append(part)
326 if tmppart.is_extended(): 305 if tmppart.is_extended():
327 for part_log in parts: 306 for part_log in parts:
328 if part_log < 4.9: continue 307 if part_log < (4 + FREE_MINOR_FRAC_LOG): continue
329 partlist.append(part_log) 308 partlist.append(part_log)
330 return partlist 309 return partlist
331 310
332 ## 311 ##
333 # Returns partition info in a format suitable for passing to install_profile.set_partition_tables() 312 # Returns partition info in a format suitable for passing to install_profile.set_partition_tables()
334 def get_install_profile_structure(self): 313 def get_install_profile_structure(self):
335 devdic = {} 314 devdic = {}
336 for part in self._partitions: 315 for part in self._partitions:
337 tmppart = self._partitions[part] 316 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() } 317 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 318 return devdic
340 319
341 ## 320 ##
342 # Returns the minor of the extended partition, if any 321 # Returns the minor of the extended partition, if any
343 def get_extended_partition(self): 322 def get_extended_partition(self):
346 if tmppart.is_extended(): 325 if tmppart.is_extended():
347 return part 326 return part
348 return 0 327 return 0
349 328
350 ## 329 ##
330 # Returns the drive model
331 def get_model(self):
332 return self._parted_dev.model
333
334 ##
351 # Sets the disklabel type 335 # Sets the disklabel type
352 def set_disklabel(self, disklabel): 336 def set_disklabel(self, disklabel):
353 self._disklabel = disklabel 337 self._disklabel = disklabel
354 338
355 ## 339 ##
358 return self._disklabel 342 return self._disklabel
359 343
360 ## 344 ##
361 # Returns the number of sectors on the device 345 # Returns the number of sectors on the device
362 def get_num_sectors(self): 346 def get_num_sectors(self):
363 return int(self._total_sectors) 347 return long(self._total_sectors)
364 348
365 ## 349 ##
366 # Returns the size of a cylinder in bytes 350 # Returns the size of a cylinder in bytes
367 def get_cylinder_size(self): 351 def get_cylinder_size(self):
368 return int(self._cylinder_bytes) 352 return long(self._cylinder_bytes)
369 353
370 ## 354 ##
371 # Returns the size of a sector in bytes 355 # Returns the size of a sector in bytes
372 def get_sector_size(self): 356 def get_sector_size(self):
373 return int(self._sector_bytes) 357 return long(self._sector_bytes)
374 358
375 ## 359 ##
376 # Returns the number of cylinders 360 # Returns the number of cylinders
377 def get_num_cylinders(self): 361 def get_num_cylinders(self):
378 return int(self._geometry['cylinders']) 362 return long(self._geometry['cylinders'])
379 363
380 ## 364 ##
381 # Returns the total number of bytes on the device 365 # Returns the total number of bytes on the device
382 def get_drive_bytes(self): 366 def get_drive_bytes(self):
383 return int(self._total_bytes) 367 return long(self._total_bytes)
384 368
385 ## 369 ##
386 # Returns the total number of MB on the device 370 # Returns the total number of MB on the device
387 def get_total_mb(self): 371 def get_total_mb(self):
372 if self._local_device:
388 return self._total_mb 373 return self._total_mb
374 else:
375 total_mb = 0
376 for tmppart in self._partitions:
377 total += tmppart.get_mb()
378 return total_mb
389 379
390 ## 380 ##
391 # Returns partition info dictionary 381 # Returns partition info dictionary
392 def get_partitions(self): 382 def get_partitions(self):
393 return self._partitions 383 return self._partitions
394 384
395 ## 385 ##
396 # Prints disk geometry to STDOUT (no longer used) 386 # Prints disk geometry to STDOUT (no longer used)
397 def print_geometry(self): 387 def print_geometry(self):
398 print self._total_bytes, self._geometry 388 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 389
426## 390##
427# This class represents a partition within a GLIStorageDevice object 391# This class represents a partition within a GLIStorageDevice object
428class Partition: 392class Partition:
429 "Class representing a single partition within a Device object" 393 "Class representing a single partition within a Device object"
438 _mountopts = None 402 _mountopts = None
439 _format = None 403 _format = None
440 _resizeable = None 404 _resizeable = None
441 _min_mb_for_resize = 0 405 _min_mb_for_resize = 0
442 _mb = 0 406 _mb = 0
407 _mkfsopts = None
443 408
444 ## 409 ##
445 # Initialization function for the Partition class 410 # Initialization function for the Partition class
446 # @param device Parent GLIStorageDevice object 411 # @param device Parent GLIStorageDevice object
447 # @param minor Minor of partition 412 # @param minor Minor of partition
449 # @param start Parameter Start sector of partition 414 # @param start Parameter Start sector of partition
450 # @param end Parameter Start sector of partition 415 # @param end Parameter Start sector of partition
451 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.) 416 # @param type Parameter Type of partition (ext2, ext3, fat32, linux-swap, free, extended, etc.)
452 # @param mountpoint='' Mountpoint of partition 417 # @param mountpoint='' Mountpoint of partition
453 # @param mountopts='' Mount options of partition 418 # @param mountopts='' Mount options of partition
419 # @param mkfsopts='' Additional mkfs options
454 # @param format=True Format partition 420 # @param format=True Format partition
455 # @param existing=False This partition exists on disk 421 # @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): 422 def __init__(self, device, minor, mb, start, end, type, mountpoint='', mountopts='', format=True, existing=False, origminor=0, mkfsopts=''):
457 self._device = device 423 self._device = device
458 self._minor = float(minor) 424 self._minor = float(minor)
459 self._start = int(start) 425 self._start = long(start)
460 self._end = int(end) 426 self._end = long(end)
461 self._type = type or "unknown" 427 self._type = type or "unknown"
462 self._mountpoint = mountpoint 428 self._mountpoint = mountpoint
463 self._mountopts = mountopts 429 self._mountopts = mountopts
464 self._format = format 430 self._format = format
465 self._mb = mb 431 self._mb = mb
466 self._orig_minor = origminor 432 self._orig_minor = origminor
433 self._mkfsopts = mkfsopts
467 if type != "free": 434 if type != "free":
468 if existing and not origminor: 435 if existing and not origminor:
469 self._orig_minor = self._minor 436 self._orig_minor = self._minor
470 self._minor = int(self._minor) 437 self._minor = int(self._minor)
471 self._orig_minor = int(self._orig_minor) 438 self._orig_minor = int(self._orig_minor)
472 if existing: 439 if existing:
440 try:
473 parted_part = device._parted_disk.get_partition(self._orig_minor) 441 parted_part = device._parted_disk.get_partition(self._orig_minor)
474 label_type = device._parted_disk.type.name 442 label_type = device._parted_disk.type.name
475 if label_type == "loop": 443 if label_type == "loop":
476 dev_node = device._device 444 dev_node = device._device
477 else: 445 else:
478 dev_node = device._device + str(self._orig_minor) 446 dev_node = device._device + str(self._orig_minor)
479 print "dev_node = " + dev_node 447# print "dev_node = " + dev_node
480 if type == "ntfs": 448 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 .\+//'")) 449 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 450 self._min_mb_for_resize = long(min_bytes / MEGABYTE) + 1
483 self._resizeable = True 451 self._resizeable = True
484 elif type == "ext2" or type == "ext3": 452 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\+//'"))) 453 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\+//'"))) 454 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) 455 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 456 # 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 457 self._min_mb_for_resize = self._mb - long(free_bytes / MEGABYTE) + 50
490 self._resizeable = True 458 self._resizeable = True
491 else: 459 else:
492 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor)) 460 parted_part = self._device._parted_disk.get_partition(int(self._orig_minor))
493 try:
494 parted_fs = parted_part.geom.file_system_open() 461 parted_fs = parted_part.geom.file_system_open()
495 except:
496 self._resizeable = False
497 return
498 resize_constraint = parted_fs.get_resize_constraint() 462 resize_constraint = parted_fs.get_resize_constraint()
499 min_bytes = resize_constraint.min_size * self._device._sector_bytes 463 min_bytes = resize_constraint.min_size * self._device._sector_bytes
500 self._min_mb_for_resize = int(min_bytes / MEGABYTE) + 1 464 self._min_mb_for_resize = long(min_bytes / MEGABYTE) + 1
501 self._resizeable = True 465 self._resizeable = True
466 except:
467 self._resizeable = False
502 468
503 ## 469 ##
504 # Returns whether or not the partition is extended 470 # Returns whether or not the partition is extended
505 def is_extended(self): 471 def is_extended(self):
506 if self._type == "extended": 472 if self._type == "extended":
510 476
511 ## 477 ##
512 # Returns whether or not the partition is logical 478 # Returns whether or not the partition is logical
513 def is_logical(self): 479 def is_logical(self):
514 if self._type == "free": 480 if self._type == "free":
515 if int(self._minor) + 0.9 == self._minor: 481 if int(self._minor) + FREE_MINOR_FRAC_LOG == self._minor:
516 return True 482 return True
517 else: 483 else:
518 return False 484 return False
519 elif archinfo[self._device._arch]['extended'] and self._minor > 4: 485 elif archinfo[self._device._arch]['extended'] and self._minor > 4:
520 return True 486 return True
542 return None 508 return None
543 else: 509 else:
544 return self._device.get_partition_at(self._start, ignore_extended=0) 510 return self._device.get_partition_at(self._start, ignore_extended=0)
545 511
546 ## 512 ##
513 # Sets the options passed to mkfs
514 # @param mkfsopts Options passed to mkfs
515 def set_mkfsopts(self, mkfsopts):
516 self._mkfsopts = mkfsopts
517
518 ##
519 # Returns the options passes to mkfs
520 def get_mkfsopts(self):
521 return self._mkfsopts
522
523 ##
547 # Sets the start sector for the partition 524 # Sets the start sector for the partition
548 # @param start Start sector 525 # @param start Start sector
549 def set_start(self, start): 526 def set_start(self, start):
550 self._start = int(start) 527 self._start = long(start)
551 528
552 ## 529 ##
553 # Returns the start sector for the partition 530 # Returns the start sector for the partition
554 def get_start(self): 531 def get_start(self):
555 return int(self._start) 532 return long(self._start)
556 533
557 ## 534 ##
558 # Sets the end sector of the partition 535 # Sets the end sector of the partition
559 # @param end End sector 536 # @param end End sector
560 def set_end(self, end): 537 def set_end(self, end):
561 self._end = int(end) 538 self._end = long(end)
562 539
563 ## 540 ##
564 # Returns end sector for the partition 541 # Returns end sector for the partition
565 def get_end(self): 542 def get_end(self):
566 return int(self._end) 543 return long(self._end)
567 544
568 ## 545 ##
569 # Returns size of partition in MB 546 # Returns size of partition in MB
570 def get_mb(self): 547 def get_mb(self):
571 return int(self._mb) 548 return long(self._mb)
572 549
573 ## 550 ##
574 # Sets size of partition in MB 551 # Sets size of partition in MB
575 # @param mb Parameter description 552 # @param mb Parameter description
576 def set_mb(self, mb): 553 def set_mb(self, mb):
577 self._mb = int(mb) 554 self._mb = long(mb)
578 555
579 ## 556 ##
580 # Sets type of partition 557 # Sets type of partition
581 # @param type Parameter description 558 # @param type Parameter description
582 def set_type(self, type): 559 def set_type(self, type):
671 # Returns maximum MB for resize 648 # Returns maximum MB for resize
672 def get_max_mb_for_resize(self): 649 def get_max_mb_for_resize(self):
673 if self._resizeable: 650 if self._resizeable:
674 free_minor = 0 651 free_minor = 0
675 if self.is_logical(): 652 if self.is_logical():
676 free_minor = self._minor + 0.9 653 free_minor = self._minor + FREE_MINOR_FRAC_LOG
677 else: 654 else:
678 free_minor = self._minor + 0.1 655 free_minor = self._minor + FREE_MINOR_FRAC_PRI
679 if free_minor in self._device._partitions: 656 if free_minor in self._device._partitions:
680 return self._mb + self._device._partitions[free_minor]._mb 657 return self._mb + self._device._partitions[free_minor]._mb
681 else: 658 else:
682 return self._mb 659 return self._mb
683 else: 660 else:
687 # Resizes the partition 664 # Resizes the partition
688 # @param mb New size in MB 665 # @param mb New size in MB
689 def resize(self, mb): 666 def resize(self, mb):
690 free_minor = self._minor 667 free_minor = self._minor
691 if self.is_logical(): 668 if self.is_logical():
692 free_minor += 0.9 669 free_minor += FREE_MINOR_FRAC_LOG
693 else: 670 else:
694 free_minor += 0.1 671 free_minor += FREE_MINOR_FRAC_PRI
695 if mb < self._mb: 672 if mb < self._mb:
696 # Shrinking 673 # Shrinking
697 if not free_minor in self._device._partitions: 674 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) 675 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 676 self._device._partitions[free_minor]._mb += self._mb - mb
711# Returns a list of detected partitionable devices 688# Returns a list of detected partitionable devices
712def detect_devices(): 689def detect_devices():
713 devices = [] 690 devices = []
714 691
715 # Make sure sysfs exists 692 # Make sure sysfs exists
693 # TODO: rewrite for 2.4 support
716 if not os.path.exists("/sys/bus"): 694 if not os.path.exists("/sys/bus"):
717 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)") 695 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "no sysfs found (you MUST use a kernel >2.6)")
718 # Make sure /proc/partitions exists 696 # Make sure /proc/partitions exists
719 if not os.path.exists("/proc/partitions"): 697 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!") 698 raise GLIException("GLIStorageDeviceError", 'fatal', 'detect_devices', "/proc/partitions does not exist! Please make sure procfs is in your kernel and mounted!")
757 735
758 partitions.append(( major, minor, device )) 736 partitions.append(( major, minor, device ))
759 737
760 # Scan sysfs for the devices of type 'x' 738 # Scan sysfs for the devices of type 'x'
761 # 'x' being a member of the list below: 739 # 'x' being a member of the list below:
740 # TODO: rewrite for 2.4 support
762 for dev_type in [ "ide", "scsi" ]: # Other device types? usb? fw? 741 for dev_type in [ "ide", "scsi" ]: # Other device types? usb? fw?
763 if os.path.exists("/sys/bus/" + dev_type): 742 if os.path.exists("/sys/bus/" + dev_type):
764 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices") 743 sysfs_devices = os.listdir("/sys/bus/"+dev_type+"/devices")
765 744
766 # For each device in the devices on that bus 745 # For each device in the devices on that bus

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

  ViewVC Help
Powered by ViewVC 1.1.20