projects
/
snf-image-creator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the image partitions in bundle_volume
[snf-image-creator]
/
image_creator
/
disk.py
diff --git
a/image_creator/disk.py
b/image_creator/disk.py
index
deafb95
..
f292e69
100644
(file)
--- a/
image_creator/disk.py
+++ b/
image_creator/disk.py
@@
-67,6
+67,7
@@
class Disk(object):
self._devices = []
self.source = source
self.out = output
self._devices = []
self.source = source
self.out = output
+ self.meta = {}
def _add_cleanup(self, job, *args):
self._cleanup_jobs.append((job, args))
def _add_cleanup(self, job, *args):
self._cleanup_jobs.append((job, args))
@@
-79,7
+80,7
@@
class Disk(object):
def _dir_to_disk(self):
if self.source == '/':
def _dir_to_disk(self):
if self.source == '/':
- return bundle_volume(self.out)
+ return bundle_volume(self.out, self.meta)
raise FatalError("Using a directory as media source is supported")
def cleanup(self):
raise FatalError("Using a directory as media source is supported")
def cleanup(self):
@@
-165,16
+166,16
@@
class DiskDevice(object):
as created by the device-mapper.
"""
as created by the device-mapper.
"""
- def __init__(self, device, output, bootable=True):
+ def __init__(self, device, output, bootable=True, meta={}):
"""Create a new DiskDevice."""
self.real_device = device
self.out = output
self.bootable = bootable
"""Create a new DiskDevice."""
self.real_device = device
self.out = output
self.bootable = bootable
+ self.meta = meta
self.progress_bar = None
self.guestfs_device = None
self.size = 0
self.progress_bar = None
self.guestfs_device = None
self.size = 0
- self.meta = {}
self.g = guestfs.GuestFS()
self.g.add_drive_opts(self.real_device, readonly=0)
self.g = guestfs.GuestFS()
self.g.add_drive_opts(self.real_device, readonly=0)