summaryrefslogtreecommitdiffstats
path: root/vmchooser/runImage.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vmchooser/runImage.cxx')
-rw-r--r--vmchooser/runImage.cxx24
1 files changed, 6 insertions, 18 deletions
diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx
index 2a33db5..ff9f340 100644
--- a/vmchooser/runImage.cxx
+++ b/vmchooser/runImage.cxx
@@ -84,29 +84,17 @@ void runImage(fltk::Widget*, void* p)
**/
string runImage(DataEntry& dat, string confxml)
{
- //cout << dat.imgtype << endl << VMWARE << endl;
- if (dat.imgtype == VMWARE) {
- //cout << confxml << endl;
- char* arg[] = { (char *) "/var/X11R6/bin/run-vmware.sh",
- (char*)confxml.c_str(),
- NULL };
-
- //cout << arg << endl; //"run-vmware.sh imagename os (Window-Title) network"
- execvp("/var/X11R6/bin/run-vmware.sh", arg);
+ if(! dat.command.empty() ) {
+ char* arg[] = { (char*) dat.command.c_str(), '\0' };
+ execvp((char*) dat.command.c_str(), arg);
}
- if (dat.imgtype == VBOX) {
- char* arg[] = { (char *) "/var/X11R6/bin/run-virtualbox.sh",
+ char* arg[] = { (char *) "/var/X11R6/bin/run-virt.sh",
(char*)confxml.c_str(),
NULL };
- //cout << arg << endl; //"run-vmware.sh imagename os (Window-Title) network"
- execvp("/var/X11R6/bin/run-virtualbox.sh", arg);
+ execvp("/var/X11R6/bin/run-virt.sh", arg);
- }
- if(! dat.command.empty() ) {
- char* arg[] = { (char*) dat.command.c_str(), '\0' };
- execvp((char*) dat.command.c_str(), arg);
- }
+ // not reachable - but for compiling issues
return string();
}