From 9c236aadb15a34461d7ddad686d9759715f5626d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 17 Sep 2010 15:56:03 +0000
Subject: do not build vm image by default for masters, do it only if vm_type
 settings is set (check qemu-img for valid types, like qcow2, vmdk, ...)

---
 draklive | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/draklive b/draklive
index acc96c0..7f9b546 100755
--- a/draklive
+++ b/draklive
@@ -1239,6 +1239,12 @@ sub create_image {
 sub create_vm_image {
     my ($live) = @_;
 
+    my $vm_type = $live->{settings}{vm_type};
+    if (!$vm_type) {
+        warn "no vm_type has been set in settings, skipping";
+        return;
+    }
+
     if (!$live->{media}->get_media_setting('image')) {
         warn "not implemented yet\n";
         return;
@@ -1250,9 +1256,9 @@ sub create_vm_image {
     }
 
     my $vm_image = $master;
-    $vm_image =~ s/.img$/.vmdk/;
+    $vm_image =~ s/.img$/.$vm_type/;
 
-    run_("qemu-img", "convert", "-O", "vmdk", $master, $vm_image);
+    run_("qemu-img", "convert", "-O", $vm_type, $master, $vm_image);
 }
 
 sub get_rescue_files {
-- 
cgit v1.2.1