Revision 091c0335 image_creator/os_type/__init__.py
| b/image_creator/os_type/__init__.py | ||
|---|---|---|
| 128 | 128 |
self.image = image |
| 129 | 129 |
|
| 130 | 130 |
self.root = image.root |
| 131 |
self.g = image.g |
|
| 132 | 131 |
self.out = image.out |
| 133 | 132 |
|
| 134 | 133 |
self.needed_sysprep_params = {}
|
| ... | ... | |
| 141 | 140 |
# Many guestfs compilations don't support scrub |
| 142 | 141 |
self._scrub_support = True |
| 143 | 142 |
try: |
| 144 |
self.g.available(['scrub']) |
|
| 143 |
self.image.g.available(['scrub'])
|
|
| 145 | 144 |
except RuntimeError: |
| 146 | 145 |
self._scrub_support = False |
| 147 | 146 |
|
| ... | ... | |
| 288 | 287 |
"""Umount all mounted filesystems.""" |
| 289 | 288 |
|
| 290 | 289 |
self.out.output("Umounting the media ...", False)
|
| 291 |
self.g.umount_all() |
|
| 290 |
self.image.g.umount_all()
|
|
| 292 | 291 |
self.mounted = False |
| 293 | 292 |
self.out.success('done')
|
| 294 | 293 |
|
| ... | ... | |
| 299 | 298 |
@add_prefix |
| 300 | 299 |
def _ls(self, directory): |
| 301 | 300 |
"""List the name of all files under a directory""" |
| 302 |
return self.g.ls(directory) |
|
| 301 |
return self.image.g.ls(directory)
|
|
| 303 | 302 |
|
| 304 | 303 |
@add_prefix |
| 305 | 304 |
def _find(self, directory): |
| 306 | 305 |
"""List the name of all files recursively under a directory""" |
| 307 |
return self.g.find(directory) |
|
| 306 |
return self.image.g.find(directory)
|
|
| 308 | 307 |
|
| 309 | 308 |
def _foreach_file(self, directory, action, **kargs): |
| 310 | 309 |
"""Perform an action recursively on all files under a directory. |
| ... | ... | |
| 333 | 332 |
ftype = None if 'ftype' not in kargs else kargs['ftype'] |
| 334 | 333 |
has_ftype = lambda x, y: y is None and True or x['ftyp'] == y |
| 335 | 334 |
|
| 336 |
for f in self.g.readdir(directory): |
|
| 335 |
for f in self.image.g.readdir(directory):
|
|
| 337 | 336 |
if f['name'] in ('.', '..'):
|
| 338 | 337 |
continue |
| 339 | 338 |
|
| ... | ... | |
| 350 | 349 |
|
| 351 | 350 |
def _do_collect_metadata(self): |
| 352 | 351 |
"""helper method for collect_metadata""" |
| 353 |
self.meta['ROOT_PARTITION'] = "%d" % self.g.part_to_partnum(self.root) |
|
| 354 |
self.meta['OSFAMILY'] = self.g.inspect_get_type(self.root) |
|
| 355 |
self.meta['OS'] = self.g.inspect_get_distro(self.root) |
|
| 352 |
self.meta['ROOT_PARTITION'] = \ |
|
| 353 |
"%d" % self.image.g.part_to_partnum(self.root) |
|
| 354 |
self.meta['OSFAMILY'] = self.image.g.inspect_get_type(self.root) |
|
| 355 |
self.meta['OS'] = self.image.g.inspect_get_distro(self.root) |
|
| 356 | 356 |
if self.meta['OS'] == "unknown": |
| 357 | 357 |
self.meta['OS'] = self.meta['OSFAMILY'] |
| 358 |
self.meta['DESCRIPTION'] = self.g.inspect_get_product_name(self.root) |
|
| 358 |
self.meta['DESCRIPTION'] = self.image.g.inspect_get_product_name(self.root)
|
|
| 359 | 359 |
|
| 360 | 360 |
def _do_mount(self, readonly): |
| 361 | 361 |
"""helper method for mount""" |
| 362 | 362 |
try: |
| 363 |
self.g.mount_options('ro' if readonly else 'rw', self.root, '/')
|
|
| 363 |
self.image.g.mount_options( |
|
| 364 |
'ro' if readonly else 'rw', self.root, '/') |
|
| 364 | 365 |
except RuntimeError as msg: |
| 365 | 366 |
self.out.warn("unable to mount the root partition: %s" % msg)
|
| 366 | 367 |
return False |
Also available in: Unified diff