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

Diff of /trunk/src/GLIStorageDevice.py

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

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

Legend:
Removed from v.386  
changed lines
  Added in v.1258

  ViewVC Help
Powered by ViewVC 1.1.20