File vmware-vmwarelib.patch of Package opennebula-driver-vmware

File vmware-vmwarelib.patch of Package opennebula-driver-vmware (Revision 1c93f81680976ab24559831297e99311)

Currently displaying revision 1c93f81680976ab24559831297e99311, show latest

--- lib/vmwarelib.rb.orig	2011-07-09 00:14:27.337368199 +0200
+++ lib/vmwarelib.rb	2011-07-09 01:55:45.499981783 +0200
@@ -23,14 +23,16 @@
 # Set up the environment for the driver                                        #
 # ---------------------------------------------------------------------------- #
 
-ONE_LOCATION = ENV["ONE_LOCATION"]
+#ONE_LOCATION = ENV["ONE_LOCATION"]
 
 if !ONE_LOCATION
-    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
+#    RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
     ETC_LOCATION      = "/etc/one/"
+    BIN_LOCATION      = "/usr/bin"
 else
-    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
+#    RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
     ETC_LOCATION      = ONE_LOCATION + "/etc/"
+    BIN_LOCATION      = ONE_LOCATION + "/bin"
 end
 
 $: << RUBY_LIB_LOCATION
@@ -43,7 +45,7 @@
 
 # Common functions
 def perform_action(command)    
-    command = ENV['ONE_LOCATION'] + "/bin/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
+    command = BIN_LOCATION + "/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
     
     action_result = LocalCommand.run(command)