From a842d5be5c0235aff7df192592349496278c4a2d Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 3 Nov 2009 17:35:41 +0000
Subject: bugfix: necessary because of changed paths

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3181 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm   | 4 +++-
 os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm | 4 +++-
 os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm | 4 +++-
 os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'os-plugins/plugins')

diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
index 166149ba..51361f31 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Base.pm
@@ -198,8 +198,10 @@ sub fillRunlevelScript
         case \$1 in
           start)
             echo "Starting vmware background services ..."
+            # include default directories
+            . /etc/opt/openslx/openslx.conf
             # load the configuration file
-            . /etc/vmware/slxvmconfig
+            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
             load_modules
             setup_vmnet0
             setup_vmnet1
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
index a28bc7a1..fb7b4998 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Debian.pm
@@ -179,8 +179,10 @@ sub fillRunlevelScript
         case \$1 in
           start)
             log_daemon_msg "Starting vmware background services ..." "vmware"
+            # include default directories
+            . /etc/opt/openslx/openslx.conf
             # load the configuration file
-            . /etc/vmware/slxvmconfig
+            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
             mkdir -p /var/run/vmware
             touch /var/run/vmware/dhcpd-vmnet1.leases
             touch /var/run/vmware/dhcpd-vmnet8.leases
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
index 3fbed9f9..a57e5c8e 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Gentoo.pm
@@ -173,8 +173,10 @@ sub fillRunlevelScript
         # start/stop functions
         start() {
             ebegin "Starting vmware background services ..."
+            # include default directories
+            . /etc/opt/openslx/openslx.conf
             # load the configuration file
-            . /etc/vmware/slxvmconfig
+            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
             load_modules || eerror "The loading of vmware modules failed"
             setup_vmnet0 || eerror "Problems setting up vmnet0 interface"
             setup_vmnet1 || eerror "Problems setting up vmnet1 interface"
diff --git a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
index 90b8841a..7d22c70d 100644
--- a/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/Distro/Suse.pm
@@ -183,8 +183,10 @@ sub fillRunlevelScript
         case \$1 in
           start)
             echo -n "Starting vmware background services ..."
+            # include default directories
+            . /etc/opt/openslx/openslx.conf
             # load the configuration file
-            . /etc/vmware/slxvmconfig
+            . \${OPENSLX_DEFAULT_CONFDIR}/plugins/vmware/vmware.conf
             # hack to access the first serial/parallel port
             chmod a+rw /dev/ttyS0
             chmod a+rw /dev/parport0
-- 
cgit v1.2.3-55-g7522