projects
/
snf-image-creator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support mounting freebsd ufs filesystems
[snf-image-creator]
/
image_creator
/
disk.py
diff --git
a/image_creator/disk.py
b/image_creator/disk.py
index
2d6135c
..
b4311f8
100644
(file)
--- a/
image_creator/disk.py
+++ b/
image_creator/disk.py
@@
-152,7
+152,7
@@
class Disk(object):
self.out.success('looks like an image file')
sourcedev = self._losetup(self.source)
elif not stat.S_ISBLK(mode):
self.out.success('looks like an image file')
sourcedev = self._losetup(self.source)
elif not stat.S_ISBLK(mode):
- raise ValueError("Invalid media source. Only block devices, "
+ raise FatalError("Invalid media source. Only block devices, "
"regular files and directories are supported.")
else:
self.out.success('looks like a block device')
"regular files and directories are supported.")
else:
self.out.success('looks like a block device')
@@
-181,7
+181,7
@@
class Disk(object):
return "/dev/mapper/%s" % snapshot
def get_image(self, media):
return "/dev/mapper/%s" % snapshot
def get_image(self, media):
- """Returns a newly created ImageCreator instance."""
+ """Returns a newly created Image instance."""
image = Image(media, self.out)
self._images.append(image)
image = Image(media, self.out)
self._images.append(image)
@@
-189,8
+189,7
@@
class Disk(object):
return image
def destroy_image(self, image):
return image
def destroy_image(self, image):
- """Destroys an ImageCreator instance previously created by
- get_image_creator method.
+ """Destroys an Image instance previously created by get_image method.
"""
self._images.remove(image)
image.destroy()
"""
self._images.remove(image)
image.destroy()