Changeset 968 in ProjectBuilder for devel

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

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (3 diffs)

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";