diff options
| author | Bastian Wissler | 2008-06-05 15:43:29 +0200 |
|---|---|---|
| committer | Bastian Wissler | 2008-06-05 15:43:29 +0200 |
| commit | 6f444f3a04bd58a29d8dd913197565b9a40cec2d (patch) | |
| tree | 60d4efaf3712baf9f0b7f757f6dde599e288925d | |
| parent | VMChooser-Version mit XML+Info als erster Parameter fÃŒr run-vmware.sh (diff) | |
| download | vmchooser-6f444f3a04bd58a29d8dd913197565b9a40cec2d.tar.gz vmchooser-6f444f3a04bd58a29d8dd913197565b9a40cec2d.tar.xz vmchooser-6f444f3a04bd58a29d8dd913197565b9a40cec2d.zip | |
BugFix
git-svn-id: http://svn.openslx.org/svn/openslx/openslx-src-tools/trunk/os-plugins/plugins/vmchooser@1844 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rw-r--r-- | vmchooser/Makefile | 2 | ||||
| -rw-r--r-- | vmchooser/runImage.cxx | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/vmchooser/Makefile b/vmchooser/Makefile index ea75cfd..4112240 100644 --- a/vmchooser/Makefile +++ b/vmchooser/Makefile @@ -7,7 +7,7 @@ LDFLAGS=-L../fltk-2/lib/ ../fltk-2/lib/libfltk2.a -lpng ../fltk-2/lib/libfltk2_i all: main.o anyoption.o SWindow.o readXmlDir.o readLinSess.o runImage.o addPrinters.o addScanners.o ${CXX} ${STATIC} main.o anyoption.o SWindow.o runImage.o readLinSess.o readXmlDir.o addPrinters.o addScanners.o -o vmchooser ${LDFLAGS} ${BOOST} - strip vmchooser +#strip vmchooser main.o: main.cxx ${CXX} ${CFLAGS} -c main.cxx -o main.o diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx index c9ae261..0a57736 100644 --- a/vmchooser/runImage.cxx +++ b/vmchooser/runImage.cxx @@ -4,6 +4,7 @@ #include "inc/SWindow.h" #include "inc/functions.h" +#include <errno.h> #include <sys/wait.h> #include <iostream> #include <string> @@ -60,16 +61,18 @@ void runImage(fltk::Widget*, void* p) **/ string runImage(DataEntry& dat, char* confxml) { + cout << dat.imgtype << endl << VMWARE << endl; if (dat.imgtype == VMWARE) { - //cout << dat.xml_name << endl; + cout << confxml << endl; char* arg[] = { "/var/X11R6/bin/run-vmware.sh", confxml, - strcat("/var/lib/vmware/",dat.imgname.c_str()), + (char*) dat.imgname.insert(0, "/var/lib/vmware/" ).c_str(), (char*) dat.os.c_str(), (char*)dat.network.c_str(), - '\0' }; - // run-vmware.sh imagename os (Window-Title) network - execvp("/var/X11R6/bin/run-vmware.sh", arg ); + NULL }; + + cout << "run-vmware.sh imagename os (Window-Title) network" << endl; + execvp("/var/X11R6/bin/run-vmware.sh", arg); } if(! dat.command.empty() ) { char* arg[] = { (char*) dat.command.c_str(), '\0' }; |