From ccb6d60b0050b768c3fa1df262be23dd9e799ea6 Mon Sep 17 00:00:00 2001
From: Sebastian Schmelzer
Date: Thu, 12 May 2011 17:58:15 +0200
Subject: change conf path to /etc/vmchooser/vmchooser.conf add missing option
 to usage

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

diff --git a/src/globals.h b/src/globals.h
index 0a40059..b36c959 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -5,7 +5,7 @@
 
 #define VMCHOOSER_PLUGIN_PATH "/opt/openslx/plugin-repo/vmchooser"
 #define VMCHOOSER_BIN_PATH "/var/opt/openslx/bin"
-#define VMCHOOSER_ETC_BASE_PATH "/etc/opt/openslx/plugins/vmchooser"
+#define VMCHOOSER_ETC_BASE_PATH "/etc/vmchooser"
 #define VMCHOOSER_VMPATH "/var/lib/virt"
 #define VMCHOOSER_THEME_BASE "/usr/local/share/vmchooser/themes"
 
diff --git a/src/main.cpp b/src/main.cpp
index 17e84e4..1fe6401 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,7 @@ int main(int argc, char *argv[]) {
             "Console",
             "Usage: vmchooser [ OPTIONS ]\n\n"
             "  -d, --default    name of default session\n"
+            "  -c, --config     alternative config file\n"
             "  -f, --file       direct boot FILE\n"
             "  -P, --pool       name of the environment\n"
             "  -p, --path       path to vmware .xml files\n"
@@ -161,9 +162,7 @@ int main(int argc, char *argv[]) {
         pool = cmdOptions.value("pool");
     } else if (settings.contains("pool")) {
         pool = settings.value("pool").toString();
-    } else if (settings.contains("vmchooser_env")) {
-        pool = settings.value("vmchooser_env").toString();
-    }
+    } 
 
     if (cmdOptions.contains("theme")) {
     	theme = cmdOptions.value("theme");
-- 
cgit v1.2.3-55-g7522