From b072aab658a390352d909559e85f6e18d4f51892 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 7 Nov 2014 13:10:33 +0000 Subject: Don't create the rawdisk image inside of create_local_system Now we can use create_local_system to deploy create a system in a device or in a rawdisk image. --- morphlib/exts/kvm.write | 1 + morphlib/exts/openstack.write | 1 + morphlib/exts/rawdisk.write | 1 + morphlib/exts/virtualbox-ssh.write | 1 + morphlib/writeexts.py | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) diff --git a/morphlib/exts/kvm.write b/morphlib/exts/kvm.write index 16f188b5..dd46d36b 100755 --- a/morphlib/exts/kvm.write +++ b/morphlib/exts/kvm.write @@ -62,6 +62,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension): fd, raw_disk = tempfile.mkstemp() os.close(fd) + self.create_raw_disk_image(raw_disk) self.create_local_system(temp_root, raw_disk) try: diff --git a/morphlib/exts/openstack.write b/morphlib/exts/openstack.write index 516fe367..744fde58 100755 --- a/morphlib/exts/openstack.write +++ b/morphlib/exts/openstack.write @@ -68,6 +68,7 @@ class OpenStackWriteExtension(morphlib.writeexts.WriteExtension): fd, raw_disk = tempfile.mkstemp() os.close(fd) + self.create_raw_disk_image(raw_disk) self.create_local_system(temp_root, raw_disk) self.status(msg='Temporary disk image has been created at %s' % raw_disk) diff --git a/morphlib/exts/rawdisk.write b/morphlib/exts/rawdisk.write index 12db4398..7d0ebaee 100755 --- a/morphlib/exts/rawdisk.write +++ b/morphlib/exts/rawdisk.write @@ -47,6 +47,7 @@ class RawDiskWriteExtension(morphlib.writeexts.WriteExtension): self.upgrade_local_system(location, temp_root) else: try: + self.create_raw_disk_image(location) self.create_local_system(temp_root, location) self.status(msg='Disk image has been created at %s' % location) except Exception: diff --git a/morphlib/exts/virtualbox-ssh.write b/morphlib/exts/virtualbox-ssh.write index 39ea8f86..8c3d3059 100755 --- a/morphlib/exts/virtualbox-ssh.write +++ b/morphlib/exts/virtualbox-ssh.write @@ -68,6 +68,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension): fd, raw_disk = tempfile.mkstemp() os.close(fd) + self.create_raw_disk_image(raw_disk) self.create_local_system(temp_root, raw_disk) try: diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index a63c260e..a81e0c22 100644 --- a/morphlib/writeexts.py +++ b/morphlib/writeexts.py @@ -145,7 +145,6 @@ class WriteExtension(cliapp.Application): def create_local_system(self, temp_root, raw_disk): '''Create a raw system image locally.''' - self.create_raw_disk_image(raw_disk) try: self.mkfs_btrfs(raw_disk) mp = self.mount(raw_disk) -- cgit v1.2.1