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

Diff of /trunk/src/GLIStorageDevice.py

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

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

Legend:
Removed from v.313  
changed lines
  Added in v.668

  ViewVC Help
Powered by ViewVC 1.1.20