Merge pull request #291 from aleksei-burlakov/prepend-usr-sbin

Fix: prepend all executable with /usr/sbin

hawk/app/lib/crm_script.rb

@@ -45,7 +45,7 @@ def run(jsondata)
     tmpf = Tempfile.new 'crmscript'
     tmpf.write("script json \"#{cmd}\"")
     tmpf.close
-    cmdline = ['crm', '-f', tmpf.path]
+    cmdline = ['/usr/sbin/crm', '-f', tmpf.path]
     old_home = Util.ensure_home_for(user)
     out, err, status = Util.capture3(*cmdline)
     tmpf.unlink

hawk/app/lib/hb_report.rb

@@ -115,7 +115,7 @@ def generate(from_time, to_time, all_nodes = true)
       args.push("-Q") # Requires a version of crm report which supports this
       args.push("-S") unless all_nodes
       args.push(@path)
-      out, err, status = Util.capture3('crm', "report", *args)
+      out, err, status = Util.capture3('/usr/sbin/crm', "report", *args)
       f = File.new(@outfile, "w")
       f.write(out)
       f.close

hawk/app/lib/invoker.rb

@@ -62,7 +62,7 @@ def crm_configure_load_update(cmd)
     begin
       f << cmd
       f.close
-      CrmEvents.instance.push "crm configure\n#{cmd}\n" unless @no_log
+      CrmEvents.instance.push "/usr/sbin/crm configure\n#{cmd}\n" unless @no_log
       result = crm '-F', 'configure', 'load', 'update', f.path
     ensure
       f.unlink
@@ -73,7 +73,7 @@ def crm_configure_load_update(cmd)
   # Invoke cibadmin with command line arguments.  Returns stdout as string,
   # Raises NotFoundError, SecurityError or RuntimeError on failure.
   def cibadmin(*cmd)
-    out, err, status = Util.run_as(current_user, current_pass, 'cibadmin', *cmd)
+    out, err, status = Util.run_as(current_user, current_pass, '/usr/sbin/cibadmin', *cmd)
     case status.exitstatus
     when 0
       return out
@@ -89,23 +89,23 @@ def cibadmin(*cmd)
 
   # Invoke "cibadmin -p --replace"
   def cibadmin_replace(xml)
-    CrmEvents.instance.push "cibadmin -p --replace <<EOF\n#{xml}\nEOF" unless @no_log
+    CrmEvents.instance.push "/usr/sbin/cibadmin -p --replace <<EOF\n#{xml}\nEOF" unless @no_log
     cibadmin '-p', '--replace', stdin_data: xml
   end
 
   def cibadmin_replace_xpath(xpath, xml)
-    CrmEvents.instance.push "cibadmin -p --replace --xpath #{xpath} <<EOF\n#{xml}\nEOF" unless @no_log
+    CrmEvents.instance.push "/usr/sbin/cibadmin -p --replace --xpath #{xpath} <<EOF\n#{xml}\nEOF" unless @no_log
     cibadmin '-p', '--replace', '--xpath', xpath, stdin_data: xml
   end
 
   def cibadmin_modify(xml)
-    CrmEvents.instance.push "cibadmin -p -c --modify <<EOF\n#{xml}\nEOF" unless @no_log
+    CrmEvents.instance.push "/usr/sbin/cibadmin -p -c --modify <<EOF\n#{xml}\nEOF" unless @no_log
     cibadmin '-p', '-c', '--modify', stdin_data: xml
   end
 
   # Used by the simulator
   def crm_simulate(*cmd)
-    Util.run_as(current_user, current_pass, 'crm_simulate', *cmd)
+    Util.run_as(current_user, current_pass, '/usr/sbin/crm_simulate', *cmd)
   end
 
   private
@@ -132,7 +132,7 @@ def invoke_crm(input, *cmd)
     end
     cmd << { stdin_data: input }
 
-    out, err, status = Util.run_as(current_user, current_pass, 'crm', *cmd)
+    out, err, status = Util.run_as(current_user, current_pass, '/usr/sbin/crm', *cmd)
     [out, fudge_error(status.exitstatus, err), status.exitstatus]
   end
 

hawk/app/models/cib.rb

@@ -511,7 +511,7 @@ def initialize(id, user, pass, use_file = false, stonithwarning = false)
         init_offline_cluster id, user, use_file
         return
       end
-      out, err, status = Util.run_as(user, pass, 'cibadmin', '-Ql')
+      out, err, status = Util.run_as(user, pass, '/usr/sbin/cibadmin', '-Ql')
       case status.exitstatus
       when 0
         @xml = REXML::Document.new(out)
@@ -1125,7 +1125,7 @@ def initialize(id, user, pass, use_file = false, stonithwarning = false)
         resource_node = REXML::XPath.first(elem, "ancestor::primitive")
         if booth_resource_id != resource_node.attributes["id"]
           booth_resource_id = resource_node.attributes["id"]
-          ip = Util.safe_x('crm_resource', '-r', "#{booth_resource_id}", '-g', 'ip').strip
+          ip = Util.safe_x('/usr/sbin/crm_resource', '-r', "#{booth_resource_id}", '-g', 'ip').strip
           next unless @booth[:sites].include?(ip)
 
           if !@booth[:me]

hawk/app/models/cluster.rb

@@ -102,7 +102,7 @@ def cluster_copy(clusters)
       fname = "#{Rails.root}/tmp/dashboard.js"
       File.open(fname, "w") { |f| f.write(JSON.pretty_generate(clusters)) }
       File.chmod(0660, fname)
-      out, err, rc = Util.capture3("crm", "cluster", "copy", fname)
+      out, err, rc = Util.capture3("/usr/sbin/crm", "cluster", "copy", fname)
       Rails.logger.debug "Copy: #{out} #{err} #{rc}"
       # always succeed here: we don't really care that much if the copy succeeded or not
       true

hawk/app/models/report.rb

@@ -85,7 +85,7 @@ def transitions(hb_report)
   end
 
   def peinput_version(path)
-    nvpair = Util.safe_x("CIB_file=\"#{path}\"", 'cibadmin', '-Q', '--xpath', "/cib/configuration//crm_config//nvpair[@name='dc-version']", '2>/dev/null')
+    nvpair = Util.safe_x("CIB_file=\"#{path}\"", '/usr/sbin/cibadmin', '-Q', '--xpath', "/cib/configuration//crm_config//nvpair[@name='dc-version']", '2>/dev/null')
     m = nvpair.match(/value="([^"]+)"/)
     return nil unless m
     m[1]
@@ -144,7 +144,7 @@ def graph(hb_report, path, format = :svg)
     require "tempfile"
     tmpfile = Tempfile.new("hawk_dot")
     tmpfile.close
-    _out, err, status = Util.capture3('crm_simulate', '-x', tpath.to_s, format == :xml ? "-G" : "-D", tmpfile.path.to_s)
+    _out, err, status = Util.capture3('/usr/sbin/crm_simulate', '-x', tpath.to_s, format == :xml ? "-G" : "-D", tmpfile.path.to_s)
     rc = status.exitstatus
 
     ret = [false, err]

hawk/app/models/wizard.rb

@@ -72,7 +72,7 @@ def verify(params)
   end
 
   def command_string
-    base = ["crm", "script", "run", @name]
+    base = ["/usr/sbin/crm", "script", "run", @name]
     @params.each do |k, v|
       if v.is_a? Hash
         v.each do |kk, vv|