From f6da3e1c888bcba6bc2f182e6a324deacbbe8802 Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Tue, 3 Nov 2009 19:58:57 +0000 Subject: another path to be adapted git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3189 95ad53e4-c205-0410-b2fa-d234c58c8868 --- os-plugins/plugins/vmchooser/files/xmlfilter.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/os-plugins/plugins/vmchooser/files/xmlfilter.sh b/os-plugins/plugins/vmchooser/files/xmlfilter.sh index bc6ee2b8..5ef153cb 100755 --- a/os-plugins/plugins/vmchooser/files/xmlfilter.sh +++ b/os-plugins/plugins/vmchooser/files/xmlfilter.sh @@ -26,8 +26,11 @@ # - filter for slxgrp (which comes from /etc/machine-setup) # -if [ -f ${PLUGINCONFDIR}/vmchooser.conf ]; then - . ${PLUGINCONFDIR}/vmchooser.conf +# include default directories +. /etc/openslx.conf + +if [ -f ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf ]; then + . ${OPENSLX_DEFAULT_CONFDIR}/plugins/vmchooser/vmchooser.conf fi for FILE in $1/*.xml; do -- cgit v1.2.3-55-g7522