Changeset 658 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 4, 2009, 6:33:47 PM (16 years ago)

Author:

Bruno Cornec

Message:

Support rinse for newve

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -1462 +1462 @@
     } else {
         # Get VE context
-        my ($ptr,$vetmout,$vepath,$verebuild,$veconf) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
+        my ($ptr,$vetmout,$vepath,$verebuild,$veconf,$vepostinstall) = pb_conf_get("vetype","vetmout","vepath","verebuild","veconf");
+        my ($veb4pi) = pb_conf_get_if("veb4pi");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 
@@ -1483 +1484 @@
                     # Once setup we need to install some packages, the pb account, ...
                     #pb_system("sudo /usr/sbin/mock --install --configdir=\"$veconf->{$ENV{'PBPROJ'}}\" -r $v su","Configuring the mock VE");
-                    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)");
+                    my $post = "--before-post-install ";
+                    if (defined $veb4pi->{"$ddir-$dver-$darch"}) {
+                        $post .= $veb4pi->{"$ddir-$dver-$darch"};
+                    } elsif (defined $veb4pi->{"$ddir-$dver"}) {
+                        $post .= $veb4pi->{"$ddir-$dver"};
+                    } elsif (defined $veb4pi->{"$ddir"}) {
+                        $post .= $veb4pi->{"$ddir"};
+                    } elsif (defined $veb4pi->{"default"}) {
+                        $post .= $veb4pi->{"default"};
+                    } else {
+                        $post = "";
+                    }
+                    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");
                 } elsif ($dtype eq "deb") {
                     pb_system("","Creating the pbuilder VE");
@@ -1594 +1607 @@
         # Skip that VM if it something went wrong
         next if (($vmpid == 0) && ($vmexist == 0));
+    } else {
+        # VE
+        $vmexist = 0;
+        $vmpid = 0;
     }
     # Gather all required files to send them to the VM/VE