Changeset 1072

Timestamp:

07/13/10 00:03:38 (3 years ago)

Author:

bruno

Message:

r3953@sge91-1-82-234-15-218: bruno | 2010-07-11 23:43:35 +0200

• Fix partly #41 by externalizing the VM command in the new vmcmd option

Location:

devel

Files:

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

devel/pb-modules/etc/pb.conf.pod

@@ -420 +420 @@
  Example: vertype default = chroot
 
+=item B<vmcmd>
+
+ Nature: Mandatory
+ Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). NB: a default value is highly interesting here.
+ Value: Command to call to launch the VM emulator.  It can contain some options. Another way to pass options to the VM manager command launcher is by using the PBVMOPT environment variable, which comes in addition to the option vmopt.
+ Conffile: vm
+ Example: vmcmd default = /usr/bin/kvm
+
+
 =item B<vmhost>
 

devel/pb/bin/pb

@@ -481 +481 @@
     pb_log(0, "and that it allows remote root login (PermitRootLogin yes in /etc/ssh/sshd_config)\n");
     pb_log(0, "Also ensure that network is up, firewalling correctly configured, and perl and scp/ssh installed\n");
+    pb_log(0, "You should then be able to login with ssh -p VMPORT root\@localhost (if VM started with pb)\n");
 } elsif ($action =~ /^setupve$/) {
     pb_setup2v("ve");
@@ -1613 +1614 @@
 
         # TODO: vmmonport should be optional
-        my ($ptr,$vmpath,$vmport,$vmsize,$vmmonport) = pb_conf_get("vmtype","vmpath","vmport","vmsize","vmmonport");
+        my ($ptr,$ptr2,$vmpath,$vmport,$vmsize,$vmmonport) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize","vmmonport");
         my ($vmopt,$vmtmout,$vmsnap) = pb_conf_get_if("vmopt","vmtmout","vmsnap");
 
         my $vmtype = $ptr->{$ENV{'PBPROJ'}};
+        my $vmcmd = $ptr2->{$ENV{'PBPROJ'}};
         if (not defined $ENV{'PBVMOPT'}) {
             $ENV{'PBVMOPT'} = "";
@@ -1659 +1661 @@
     
         my $cmd;
-        my $vmcmd;      # has to be used for pb_check_ps
         my $vmm;        # has to be used for pb_check_ps
         if (($vmtype eq "qemu") || ($vmtype eq "kvm")) {
-            my $qemucmd32;
-            my $qemucmd64;
-            if ($arch eq "x86_64") {
-                $qemucmd32 = "/usr/bin/qemu-system-i386";
-                $qemucmd64 = "/usr/bin/qemu";
-            } else {
-                $qemucmd32 = "/usr/bin/qemu";
-                $qemucmd64 = "/usr/bin/qemu-system-x86_64";
-            }
-            if ($v =~ /x86_64/) {
-                    $vmcmd = "$qemucmd64";
-                } else {
-                    $vmcmd = "$qemucmd32";
-                }
-            if ($vmtype eq "kvm") {
-                $vmcmd = "/usr/bin/kvm";
-                }
             $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
             if (($create != 0) || (defined $iso)) {