Changeset 1249

Timestamp:

03/11/11 11:46:52 (2 years ago)

Author:

bruno

Message:

r4310@localhost: bruno | 2011-03-10 21:29:54 +0100

• Fix a bug in newvm where VMsize was incorrectly used after pbos introduction.

File:

• devel/pb/bin/pb (modified) (2 diffs)

devel/pb/bin/pb

@@ -2098 +2098 @@
 
         # TODO: vmmonport should be optional
-        my ($ptr,$ptr2,$vmpath,$vmport,$vmsize,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
+        my ($ptr,$ptr2,$vmpath,$vmport,$vms,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
         my ($vmopt,$vmmem,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
+        my $vmsize = pb_distro_get_param($pbos,$vms);
 
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
@@ -2181 +2182 @@
                 if (($vmtype eq "qemu") || ($vmtype eq "xen") || ($vmtype eq "kvm")) {
                     my $command = pb_check_req("qemu-img",0);
-                    pb_system("$command create -f qcow2 $vmm $vmsize->{$v}","Creating the QEMU VM");
+                    pb_system("$command create -f qcow2 $vmm $vmsize","Creating the QEMU VM");
                 } elsif ($vmtype eq "vmware") {
                 } else {