Changeset 1322


Ignore:
Timestamp:
Jun 27, 2011, 2:38:13 AM (8 years ago)
Author:
bruno
Message:
  • pb now supports distro inhritance for the vmmem parameter (Makes stuff easier for fedora)
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r1298 r1322  
    20892089        # TODO: vmmonport should be optional
    20902090        my ($ptr,$ptr2,$vmpath,$vmport,$vms,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
    2091         my ($vmopt,$vmmem,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
     2091        my ($vmopt,$vmmm,$vmtmout,$vmsnap,$vmbuildtm) = pb_conf_get_if("vmopt","vmmem","vmtmout","vmsnap","vmbuildtm");
    20922092        my $vmsize = pb_distro_get_param($pbos,$vms);
    20932093
     
    21162116
    21172117        # How much memory to allocate for VMs
    2118         if (defined $vmmem->{$v}) {
    2119             $ENV{'PBVMOPT'} .= " -m $vmmem->{$v}";
    2120         } elsif (defined $vmmem->{$ENV{'PBPROJ'}}) {
    2121             $ENV{'PBVMOPT'} .= " -m $vmmem->{$ENV{'PBPROJ'}}";
     2118        my $vmmem = pb_distro_get_param($pbos,$vmmm);
     2119        if (defined $vmmem) {
     2120            $ENV{'PBVMOPT'} .= " -m $vmmem";
    21222121        }
    21232122
  • projects/qemu/.pbrc

    r1317 r1322  
    4242vmmem mandriva-2009.0 = 1024
    4343vmopt fedora-12 = -daemonize
    44 vmmem fedora-12 = 1024
     44vmmem fedora-5 = 384
     45vmmem fedora-6 = 384
     46vmmem fedora-7 = 384
     47vmmem fedora-8 = 384
     48vmmem fedora-9 = 384
     49vmmem fedora-10 = 384
     50vmmem fedora-11 = 384
     51vmmem fedora = 1024
    4552#-no-kvm
    4653# The std driver is buggy giving an empty MAC address so use e1000
Note: See TracChangeset for help on using the changeset viewer.