From b43ec0361e1489ec8dc185e690e4c4d29da1c756 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 3 Feb 2011 16:48:53 +0100 Subject: [PATCH] feature #466: Better check of remotes location --- src/vmm_mad/sh/one_vmm_sh.rb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/vmm_mad/sh/one_vmm_sh.rb b/src/vmm_mad/sh/one_vmm_sh.rb index 980c3e649a..3ab71807e1 100755 --- a/src/vmm_mad/sh/one_vmm_sh.rb +++ b/src/vmm_mad/sh/one_vmm_sh.rb @@ -24,10 +24,10 @@ ONE_LOCATION = ENV["ONE_LOCATION"] if !ONE_LOCATION RUBY_LIB_LOCATION = "/usr/lib/one/ruby" - ETC_LOCATION = "/etc/one/" + VAR_LOCATION = "/var/lib/one" else RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby" - ETC_LOCATION = ONE_LOCATION + "/etc/" + VAR_LOCATION = ONE_LOCATION + "/var" end $: << RUBY_LIB_LOCATION @@ -47,13 +47,7 @@ class ShDriver < VirtualMachineDriver @config = read_configuration @hypervisor = hypervisor - if ONE_LOCATION == nil - @actions_path = "/usr/lib/one" - else - @actions_path = "#{ENV['ONE_LOCATION']}/lib" - end - - @actions_path << "/remotes/vmm/#{hypervisor}" + @actions_path = "#{VAR_LOCATION}/remotes/vmm/#{hypervisor}" end # ------------------------------------------------------------------------ #