summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2009-11-03 21:07:17 +0100
committerMichael Janczyk2009-11-03 21:07:17 +0100
commit1b61087bbec947c9a4455ead333c621409f23612 (patch)
tree4fff3d0c5ded2acab91797b69588ccf9920f36c6
parenthopefully last change (diff)
downloadcore-1b61087bbec947c9a4455ead333c621409f23612.tar.gz
core-1b61087bbec947c9a4455ead333c621409f23612.tar.xz
core-1b61087bbec947c9a4455ead333c621409f23612.zip
wrong script changed :(
confusing all this stage stuff should go home :) git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3191 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/vmchooser/XX_vmchooser.sh2
-rwxr-xr-xos-plugins/plugins/vmchooser/files/xmlfilter.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index 205d2feb..4f656478 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -13,7 +13,7 @@
# variables and functions available
# include default directories
-. /etc/opt/openslx/openslx.conf
+. /etc/openslx.conf
CONFFILE="/initramfs/plugin-conf/vmchooser.conf"
PLUGINCONFDIR=/mnt/${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser
diff --git a/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
index 5ef153cb..5e47e511 100755
--- a/os-plugins/plugins/vmchooser/files/xmlfilter.sh
+++ b/os-plugins/plugins/vmchooser/files/xmlfilter.sh
@@ -27,7 +27,7 @@
#
# include default directories
-. /etc/openslx.conf
+. /etc/opt/openslx/openslx.conf
if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then
. ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf