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

Diff of /trunk/src/GLIStorageDevice.py

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20