Changeset 658


Ignore:
Timestamp:
Feb 4, 2009, 6:33:47 PM (11 years ago)
Author:
Bruno Cornec
Message:

Support rinse for newve

File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/bin/pb

    r657 r658  
    14621462    } else {
    14631463        # Get VE context
    1464         my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
     1464        my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
     1465        my ($veb4pi) = pb_conf_get_if("veb4pi");
    14651466        my $vetype = $ptr->{$ENV{'PBPROJ'}};
    14661467
     
    14831484                    # Once setup we need to install some packages, the pb account, ...
    14841485                    #pb_system("sudo /usr/sbin/mock --install --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
    1485                     pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch "$darch" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\"","Creating the rinse VE for $ddir-$dver ($darch)");
     1486                    my $post = "--before-post-install ";
     1487                    if (defined $veb4pi->{"$ddir-$dver-$darch"}) {
     1488                        $post .= $veb4pi->{"$ddir-$dver-$darch"};
     1489                    } elsif (defined $veb4pi->{"$ddir-$dver"}) {
     1490                        $post .= $veb4pi->{"$ddir-$dver"};
     1491                    } elsif (defined $veb4pi->{"$ddir"}) {
     1492                        $post .= $veb4pi->{"$ddir"};
     1493                    } elsif (defined $veb4pi->{"default"}) {
     1494                        $post .= $veb4pi->{"default"};
     1495                    } else {
     1496                        $post = "";
     1497                    }
     1498                    pb_system("sudo /usr/sbin/rinse --directory \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\" --arch \"$darch\" --distribution \"$ddir-$dver\" --config \"$veconf->{$ENV{'PBPROJ'}}\" $post","Creating the rinse VE for $ddir-$dver ($darch)", "verbose");
    14861499                } elsif ($dtype eq "deb") {
    14871500                    pb_system("","Creating the pbuilder VE");
     
    15941607        # Skip that VM if it something went wrong
    15951608        next if (($vmpid == 0) && ($vmexist == 0));
     1609    } else {
     1610        # VE
     1611        $vmexist = 0;
     1612        $vmpid = 0;
    15961613    }
    15971614    # Gather all required files to send them to the VM/VE
Note: See TracChangeset for help on using the changeset viewer.