Changeset 968


Ignore:
Timestamp:
Feb 15, 2010, 3:45:05 PM (9 years ago)
Author:
bruno
Message:
  • Use pbsnap in pb_script2v instead of forcing no snapshot
  • use x86_64 arch for debian, and only amd64 for debootstrap call
  • debootstrap doesn't create a /etc/hosts file, so copy the local one in the VE
  • debian version do not include by default subversion (5.0 vs 5.0.4)
  • Announce of pb pres at slideshare
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • devel/pb-modules/etc/pb.conf

    r963 r968  
    133133osrelexpr lsb = .*\nDISTRIB_ID=LSBSI\nDISTRIB_RELEASE=(.+)
    134134osrelexpr ubuntu = .*Ubuntu.*\nDISTRIB_RELEASE=(.+)
    135 osrelexpr debian = (.+)
     135osrelexpr debian = (\d+\.\d+)
    136136osrelexpr solaris = Solaris (\d+)
    137137
  • devel/pb/bin/pb

    r965 r968  
    3838my $test = "FALSE";         # Not used
    3939my $pbforce = 0;            # Force VE/VM rebuild
    40 my $pbsnap = 0;             # Use snapshot mode for VM/VE
     40my $pbsnap = 0;             # Do not use snapshot mode for VM/VE by default
    4141my $option = "";            # Not used
    4242my @pkgs;                   # list of packages
     
    15621562
    15631563    foreach my $v (@$vm) {
    1564         # Launch VM/VE - Usage of snapshot disabled
    1565         ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,0);
     1564        # Launch VM/VE
     1565        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,$pbsnap);
    15661566
    15671567        if ($vtype eq "vm") {
     
    18071807
    18081808                    # debootstrap works with amd64 not x86_64
    1809                     $darch = "amd64" if ($darch eq "x86_64");
     1809                    my $debarch = $darch;
     1810                    $debarch = "amd64" if ($darch eq "x86_64");
    18101811                    if ($vedebstyle eq "debootstrap") {
    18111812                        my $dbsverb = "";
    18121813                        $dbsverb = "--verbose" if ($pbdebug gt 0);
    18131814
    1814                         pb_system("sudo /usr/sbin/debootstrap $dbsverb --arch=$darch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
     1815                        pb_system("sudo /usr/sbin/debootstrap $dbsverb --arch=$debarch $addpkgs $codename \"$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch\"","Creating the debootstrap VE for $ddir-$dver ($darch)", "verbose");
     1816                        # debootstrap doesn't create an /etc/hosts file
     1817                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts" ) {
     1818                            pb_system("sudo cp /etc/hosts $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts");
     1819                        }
    18151820                    } else {
    18161821                        die "Unknown vedebtype type $vedebstyle. Report to dev team";
  • projects/rinse/pbconf/devel/conf/.pbrc

    r964 r968  
    4646#velist default = mandrake-10.1-i386,mandrake-10.2-i386,mandriva-2006.0-i386,mandriva-2007.0-i386,mandriva-2007.1-i386,mandriva-2008.0-i386,mandriva-2008.1-i386,mandriva-2009.0-i386,redhat-7.3-i386,redhat-9-i386,fedora-4-i386,fedora-5-i386,fedora-6-i386,fedora-7-i386,fedora-8-i386,fedora-9-i386,fedora-10-i386,rhel-2.1-i386,rhel-3-i386,rhel-4-i386,rhel-5-i386,suse-10.0-i386,suse-10.1-i386,suse-10.2-i386,suse-10.3-i386,sles-9-i386,sles-10-i386,gentoo-nover-i386,debian-3.1-i386,debian-4.0-i386,ubuntu-6.06-i386,ubuntu-7.04-i386,ubuntu-7.10-i386,ubuntu-8.04-i386,mandriva-2007.0-x86_64,mandriva-2007.1-x86_64,mandriva-2008.0-x86_64,mandriva-2008.1-x86_64,mandriva-2009.0-x86_64,fedora-6-x86_64,fedora-7-x86_64,fedora-8-x86_64,fedora-9-x86_64,fedora-10-x86_64,rhel-4-x86_64,rhel-5-x86_64,suse-10.2-x86_64,suse-10.3-x86_64,sles-10-x86_64,gentoo-nover-x86_64,debian-4.0-x86_64,ubuntu-7.04-x86_64,ubuntu-7.10-x86_64,rhel-3-ia64,centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    4747#velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
    48 velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64,debian-5.0-x86_64,lsb-4.0.1-i386,lsb-4.0.1-x86_64
     48velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64,debian-5.0-x86_64,debian-5.0-i386,lsb-4.0.1-i386,lsb-4.0.1-x86_64
Note: See TracChangeset for help on using the changeset viewer.