Changeset 968 in ProjectBuilder

Timestamp:

Feb 15, 2010, 3:45:05 PM (14 years ago)

Author:

Bruno Cornec

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:

• devel/pb-modules/etc/pb.conf (modified) (1 diff)
• devel/pb/bin/pb (modified) (3 diffs)
• pbconf/announces3.sql (modified) ( previous)
• projects/mondorescue/pbconf/announces3.sql (modified) ( previous)
• projects/rinse/pbconf/devel/conf/.pbrc (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -133 +133 @@
 osrelexpr lsb = .*\nDISTRIB_ID=LSBSI\nDISTRIB_RELEASE=(.+)
 osrelexpr ubuntu = .*Ubuntu.*\nDISTRIB_RELEASE=(.+)
-osrelexpr debian = (.+)
+osrelexpr debian = (\d+\.\d+)
 osrelexpr solaris = Solaris (\d+) 
 

devel/pb/bin/pb

@@ -38 +38 @@
 my $test = "FALSE";         # Not used
 my $pbforce = 0;            # Force VE/VM rebuild
-my $pbsnap = 0;             # Use snapshot mode for VM/VE
+my $pbsnap = 0;             # Do not use snapshot mode for VM/VE by default
 my $option = "";            # Not used
 my @pkgs;                   # list of packages
@@ -1562 +1562 @@
 
     foreach my $v (@$vm) {
-        # Launch VM/VE - Usage of snapshot disabled
-        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,0);
+        # Launch VM/VE
+        ($vmexist,$vmpid) = pb_launchv($vtype,$v,0,$snapme,$pbsnap);
 
         if ($vtype eq "vm") {
@@ -1807 +1807 @@
 
                     # debootstrap works with amd64 not x86_64
-                    $darch = "amd64" if ($darch eq "x86_64");
+                    my $debarch = $darch;
+                    $debarch = "amd64" if ($darch eq "x86_64");
                     if ($vedebstyle eq "debootstrap") {
                         my $dbsverb = "";
                         $dbsverb = "--verbose" if ($pbdebug gt 0);
 
-                        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");
+                        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");
+                        # debootstrap doesn't create an /etc/hosts file
+                        if (! -f "$vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts" ) {
+                            pb_system("sudo cp /etc/hosts $vepath->{$ENV{'PBPROJ'}}/$ddir/$dver/$darch/etc/hosts");
+                        }
                     } else {
                         die "Unknown vedebtype type $vedebstyle. Report to dev team";

projects/rinse/pbconf/devel/conf/.pbrc

@@ -46 +46 @@
 #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
 #velist default = centos-4-i386,centos-5-i386,centos-4-x86_64,centos-5-x86_64
-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
+velist 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