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

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

  ViewVC Help
Powered by ViewVC 1.1.20