meta-starlingx/meta-stx-flock/stx-utilities/files/collect-engtools-fix-service-name-binary-path.patch

   1 diff --git a/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh b/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
   2 index 5d5701b..a81ecab 100644
   3 --- a/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
   4 +++ b/tools/engtools/hostdata-collectors/scripts/cleanup-engtools.sh
   5 @@ -31,7 +31,7 @@ LOG "Cleanup engtools:"
   6  # Brute force methods (assume trouble with: service collect-engtools.sh stop)
   7  # ( be sure not to clobber /etc/init.d/collect-engtools.sh )
   8  LOG "kill processes brute force"
   9 -pids=( $(pidof -x /usr/local/bin/collect-engtools.sh) )
  10 +pids=( $(pidof -x /usr/bin//collect-engtools.sh) )
  11  if [ ${#pids[@]} -ne 0 ]; then
  12      LOG "killing: ${pids[@]}"
  13      for pid in ${pids[@]}; do
  14 diff --git a/tools/engtools/hostdata-collectors/scripts/collect-engtools.service b/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
  15 index e00e1cd..6d4ae65 100644
  16 --- a/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
  17 +++ b/tools/engtools/hostdata-collectors/scripts/collect-engtools.service
  18 @@ -1,7 +1,7 @@
  19  [Unit]
  20  Description=Engineering data collection tools to monitor host performance
  21 -Requires=network.service
  22 -After=network.service getty.target
  23 +Requires=networking.service
  24 +After=networking.service getty.target
  25
  26  [Service]
  27  Type=forking
  28 diff --git a/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh b/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
  29 index e59f382..3140297 100644
  30 --- a/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
  31 +++ b/tools/engtools/hostdata-collectors/scripts/collect-engtools.sh
  32 @@ -263,7 +263,7 @@ OPT_USE_INTERVALS=0
  33  # Define parallel engtools configuration
  34  # - tool name, filename, and collection interval attributes
  35  BINDIR=/usr/bin
  36 -LBINDIR=/usr/local/bin
  37 +LBINDIR=/usr/bin/
  38
  39  . /etc/engtools/engtools.conf
  40