summaryrefslogtreecommitdiffstats
path: root/vmchooser/runImage.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'vmchooser/runImage.cxx')
-rw-r--r--vmchooser/runImage.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/vmchooser/runImage.cxx b/vmchooser/runImage.cxx
index 17d7190..ee84978 100644
--- a/vmchooser/runImage.cxx
+++ b/vmchooser/runImage.cxx
@@ -5,6 +5,7 @@
#include "inc/DataEntry.h"
#include "inc/SWindow.h"
#include "inc/functions.h"
+#include "inc/paths.h"
#include <sstream>
@@ -46,7 +47,8 @@ void runImage(fltk::Widget*, void* p)
strncpy(arg1, (char*) string("'\n\nStarte Image: ")
.append(dat.short_description)
.append("\n'").c_str(),MAX_LENGTH);
- char* argv[] = { (char*) "/opt/openslx/plugin-repo/vmchooser/mesgdisp",
+
+ char* argv[] = { (char*) string(VMCHOOSER_PLUGIN_PATH).append("mesgdisp").c_str(),
arg1, NULL };
//printf("%s", arg1);
@@ -90,11 +92,11 @@ void runImage(DataEntry& dat, string confxml)
char* arg[] = { (char*) dat.command.c_str(), '\0' };
execvp((char*) dat.command.c_str(), arg);
}
- char* arg[] = { (char *) "/var/X11R6/bin/run-virt.sh",
+ char* arg[] = { (char *) string(VMCHOOSER_BIN_PATH).append("run-virt.sh").c_str(),
(char*)confxml.c_str(),
NULL };
- execvp("/var/X11R6/bin/run-virt.sh", arg);
+ execvp(string(VMCHOOSER_BIN_PATH).append("run-virt.sh").c_str(), arg);
}
@@ -131,7 +133,7 @@ char* getFolderName() {
string writeConfXml(DataEntry& dat) {
//char* pname = getFolderName();
- string pname = "/etc/opt/openslx/";
+ string pname = VMCHOOSER_ETC_BASE_PATH;
xmlNodePtr cur = 0;
xmlNodePtr root = 0;