Merge branch 'feature-199' of dsa-research.org:one into feature-199

src/im_mad/im_sh/one_im_sh

@@ -17,7 +17,7 @@
 #--------------------------------------------------------------------------- #
 
 #Setup driver variables
-DRIVER_NAME=`basename $1 | cut -d. -f1`
+DRIVER_NAME=`basename $0 | cut -d. -f1`
 
 if [ -z "${ONE_LOCATION}" ]; then
     DRIVERRC=/etc/one/${DRIVER_NAME}/${DRIVER_NAME}rc

src/im_mad/im_sh/one_im_sh.rb

@@ -49,7 +49,7 @@ class InformationManager < OpenNebulaDriver
         @config     = read_configuration
         @hypervisor = hypervisor
 
-        @cmd_path   = "#{ENV['ONE_LOCATION']}/lib/remotes/im/#{hypervisor}.d"
+        @cmd_path   = "#{ENV['ONE_LOCATION']}/lib/remotes/im"
 
         # register actions
         register_action(:MONITOR, method("action_monitor"))
@@ -63,7 +63,7 @@ class InformationManager < OpenNebulaDriver
             log(number, message)
         end
 
-        cmd_string  = "#{@remote_dir}/im/run_probes #{@hypervisor} #{host}"
+        cmd_string  = "#{@cmd_path}/run_probes #{@hypervisor} #{host}"
         monitor_exe = LocalCommand.run(cmd_string, host, log_method(id))
 
         if monitor_exe.code == 0

src/im_mad/im_ssh/one_im_ssh

@@ -26,7 +26,7 @@ done
 shift $(($OPTIND - 1))
 
 #Setup driver variables
-DRIVER_NAME=`basename $1 | cut -d. -f1`
+DRIVER_NAME=`basename $0 | cut -d. -f1`
 
 if [ -z "${ONE_LOCATION}" ]; then
     DRIVERRC=/etc/one/${DRIVER_NAME}/${DRIVER_NAME}rc