Changeset 1780 in ProjectBuilder

Timestamp:

Jul 30, 2013, 6:41:52 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Now uses the new qemu syntax for port forwarding (hostfwd)

File:

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

devel/pb/bin/pb

@@ -2673 +2673 @@
             }
             # Always redirect the network and always try to use a 'pb' snapshot
-            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net nic,model=virtio -net user,hostfwd=tcp::$nport-:22 -loadvm pb $vmm"
-            $cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
+            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -net nic,model=virtio -net user,hostfwd=tcp::$nport:22 -loadvm pb $vmm"
+            #$cmd = "$vmcmd $ENV{'PBVMOPT'} -redir tcp:$nport:10.0.2.15:22 $vmm"
+            $cmd = "$vmcmd $ENV{'PBVMOPT'} -net nic -net user,hostfwd=tcp:127.0.0.1:$nport-:22 $vmm"
         } elsif ($vmtype eq "xen") {
         } elsif ($vmtype eq "vmware") {
@@ -2700 +2701 @@
             } else {
                 # Is the SSH port free? if not kill the existing process using it after a build timeout period
-                my $vmssh = pb_check_ps($tmpcmd,"tcp:$nport:10.0.2.15:22");
+                my $vmssh = pb_check_ps($tmpcmd,"tcp:127.0.0.1:$nport-:22");
                 if ($vmssh) {
                     my $buildtm = $ENV{'PBVMTMOUT'};
@@ -3802 +3803 @@
             }
         }
-        pb_log(2,"theorlist : ".Dumper(%theorlist)."\n");
+        pb_log(2,"theorlist initial: ".Dumper(%theorlist)."\n");
+        pb_log(2,"archlist: ".Dumper(%archlist)."\n");
     }
     if ($antype eq "Announce") {
@@ -3877 +3879 @@
             $theorlist{$p} = $theorlist{$p} + 1;
         }
-        pb_log(2,"theorlist : ".Dumper(%theorlist)."\n");
+        pb_log(2,"theorlist after check: ".Dumper(%theorlist)."\n");
     }
     close(LOG);
@@ -3902 +3904 @@
                     $package = $arch;
                     # TODO: If both arch have failed, we just make the last one
-                    $arch = $archlist{$t};
+                    $arch = $archlist{$t} if (defined $archlist{$t});
                 }
                 my $pbos = pb_distro_get_context("$os-$ver-$arch");
@@ -4179 +4181 @@
         ($void1, $vmexist, $vmport) = split(/ +/,$_,3);
         pb_log(2,"pb_check_ps $vmport\n");
-        $vmport =~ s/.*\stcp\:([0-9]+)\:10.0.2.15:22.*/$1/;
+        $vmport =~ s/.*=tcp\:127\.0\.0\.1\:([0-9]+)-:22.*/$1/;
         chomp($vmport);
         pb_log(2,"pb_check_ps found a VM $vmexist using port $vmport\n");