From cfc1e18f7467b39470ed8422144ea6485055d45e Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Wed, 3 Dec 2014 17:38:29 +0100
Subject: Fix mltk paths

---
 src/globals.cpp | 3 ++-
 src/globals.h   | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/globals.cpp b/src/globals.cpp
index cbaca28..c6d3d6d 100644
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -5,12 +5,13 @@
 
 //QString binPath(QApplication::applicationDirPath());
 QString binPath(VMCHOOSER_BIN_PATH);
+QString scriptsPath(VMCHOOSER_SCRIPTS_PATH);
 QString etcPath(VMCHOOSER_ETC_BASE_PATH);
 QString vSessionPath(VMCHOOSER_VMPATH);
 QString xSessionPath(VMCHOOSER_X_SESSIONS_PATH);
 QString userPath(QDir::homePath() + "/.openslx");
 
-QString runVmScript(binPath + "/run-virt.sh");
+QString runVmScript(scriptsPath + "/vmchooser-run_virt");
 QString sessionStartScript(VMCHOOSER_SESSION_START_SCRIPT);
 
 const QString globalConfFile(etcPath + "/vmchooser.conf");
diff --git a/src/globals.h b/src/globals.h
index ed70e06..c0d09d3 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -4,10 +4,11 @@
 #define VMCHOOSER_VERSION "0.1.0"
 
 #define VMCHOOSER_PLUGIN_PATH "/opt/openslx/plugin-repo/vmchooser"
-#define VMCHOOSER_BIN_PATH "/var/opt/openslx/bin"
-#define VMCHOOSER_ETC_BASE_PATH "/etc/vmchooser"
-#define VMCHOOSER_VMPATH "/var/lib/virt"
-#define VMCHOOSER_THEME_BASE "/usr/local/share/vmchooser/themes"
+#define VMCHOOSER_BIN_PATH "/opt/openslx/bin"
+#define VMCHOOSER_SCRIPTS_PATH "/opt/openslx/scripts"
+#define VMCHOOSER_ETC_BASE_PATH "/opt/openslx/vmchooser/config"
+#define VMCHOOSER_VMPATH "/mnt/vmstore"
+#define VMCHOOSER_THEME_BASE "/opt/openslx/vmchooser/themes"
 
 #define VMCHOOSER_X_SESSIONS_PATH "/usr/share/xsessions"
 
-- 
cgit v1.2.3-55-g7522