diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-17 17:41:03 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-11-17 17:42:26 +0000 |
commit | 197fbfc58a65ac224e1c8106899571614738c7bb (patch) | |
tree | 1fa30ca263262dbb63a75775a29518606b392875 /morphlib/exts/kvm.write | |
parent | 771b8bda2321de5d70b2ffcdbc1e4eaafc792fda (diff) | |
download | morph-baserock/pedroalvarez/rawdisk-to-device5.tar.gz |
Apply changes to all write extensions that uses create_local_systembaserock/pedroalvarez/rawdisk-to-device5
Diffstat (limited to 'morphlib/exts/kvm.write')
-rwxr-xr-x | morphlib/exts/kvm.write | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/morphlib/exts/kvm.write b/morphlib/exts/kvm.write index 16f188b5..fa98dcdf 100755 --- a/morphlib/exts/kvm.write +++ b/morphlib/exts/kvm.write @@ -62,14 +62,16 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension): fd, raw_disk = tempfile.mkstemp() os.close(fd) - self.create_local_system(temp_root, raw_disk) - try: + self.create_filesytem(raw_disk) + self.format_btrfs(raw_disk) + self.create_system(temp_root, raw_disk) self.transfer(raw_disk, ssh_host, vm_path) self.create_libvirt_guest(ssh_host, vm_name, vm_path, autostart) except BaseException: sys.stderr.write('Error deploying to libvirt') - os.remove(raw_disk) + if os.path.exists(raw_disk): + os.remove(raw_disk) cliapp.ssh_runcmd(ssh_host, ['rm', '-f', vm_path]) raise else: |