summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Wissler2008-06-18 16:48:44 +0200
committerBastian Wissler2008-06-18 16:48:44 +0200
commit39f4cd1e2e7e1684c6729f587b9ea7ad070b0336 (patch)
tree7ee9c321b9dc91feaf5488a72473db96bbfc7ca3
parentSome bugfixes & FAQ in README added - stupid Bug in slxgroup-parameter (diff)
downloadvmchooser-39f4cd1e2e7e1684c6729f587b9ea7ad070b0336.tar.gz
vmchooser-39f4cd1e2e7e1684c6729f587b9ea7ad070b0336.tar.xz
vmchooser-39f4cd1e2e7e1684c6729f587b9ea7ad070b0336.zip
Bugfix to work with display managers -> now we need proper xmls
git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/trunk/os-plugins/plugins/vmchooser@1885 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--vmchooser/runImage.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx
index 3f9afde..1d76d18 100644
--- a/vmchooser/runImage.cxx
+++ b/vmchooser/runImage.cxx
@@ -40,17 +40,13 @@ void runImage(fltk::Widget*, void* p)
return;
break;
case 0:
- runImage(dat, confxml);
+ exit(0);
break;
default:
- exit(0);
if( waitpid( pid, &status, 0 ) == -1 ) {
cerr << "No child with this pid (" << pid << ")" << endl;
- return;
- }
- else {
- exit(0);
}
+ runImage(dat, confxml);
break;
}
}
@@ -71,7 +67,7 @@ string runImage(DataEntry& dat, char* confxml)
(char*)dat.network.c_str(),
NULL };
- cout << "run-vmware.sh imagename os (Window-Title) network" << endl;
+ cout << arg << endl; //"run-vmware.sh imagename os (Window-Title) network"
execvp("/var/X11R6/bin/run-vmware.sh", arg);
}
if(! dat.command.empty() ) {