meta-starlingx/meta-stx-flock/stx-metal/files/0002-mtce-Adjust-paths.patch

   1 diff --git a/alarm/scripts/mtcalarm.init b/alarm/scripts/mtcalarm.init
   2 index 57f348f..419da8a 100644
   3 --- a/alarm/scripts/mtcalarm.init
   4 +++ b/alarm/scripts/mtcalarm.init
   5 @@ -20,7 +20,7 @@
   6  . /etc/init.d/functions
   7
   8  DAEMON_NAME="mtcalarmd"
   9 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  10 +DAEMON="/usr/bin/${DAEMON_NAME}"
  11  PIDFILE="/var/run/${DAEMON_NAME}.pid"
  12  PLATFORM_CONF="/etc/platform/platform.conf"
  13
  14 diff --git a/fsmon/scripts/fsmon b/fsmon/scripts/fsmon
  15 index 6d8abcc..de9da01 100644
  16 --- a/fsmon/scripts/fsmon
  17 +++ b/fsmon/scripts/fsmon
  18 @@ -20,7 +20,7 @@
  19  . /etc/init.d/functions
  20
  21  DAEMON_NAME="fsmond"
  22 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  23 +DAEMON="/usr/bin/${DAEMON_NAME}"
  24  PIDFILE="/var/run/${DAEMON_NAME}.pid"
  25
  26  # Linux Standard Base (LSB) Error Codes
  27 diff --git a/hostw/scripts/hostw b/hostw/scripts/hostw
  28 index 82a4aaf..4946092 100644
  29 --- a/hostw/scripts/hostw
  30 +++ b/hostw/scripts/hostw
  31 @@ -17,12 +17,12 @@
  32  # Short-Description: host watchdog daemon
  33  ### END INIT INFO
  34
  35 -# echo "7:3:respawn:/usr/local/bin/hostwd" >> /etc/inittab
  36 +# echo "7:3:respawn:/usr/bin/hostwd" >> /etc/inittab
  37
  38  . /etc/init.d/functions
  39
  40  DAEMON_NAME="hostwd"
  41 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  42 +DAEMON="/usr/bin/${DAEMON_NAME}"
  43  IFACE=""
  44
  45  if [ ! -e "$DAEMON" ] ; then
  46 diff --git a/hwmon/scripts/lsb/hwmon b/hwmon/scripts/lsb/hwmon
  47 index 4596a36..ba459c1 100644
  48 --- a/hwmon/scripts/lsb/hwmon
  49 +++ b/hwmon/scripts/lsb/hwmon
  50 @@ -20,7 +20,7 @@
  51  . /etc/init.d/functions
  52
  53  DAEMON_NAME="hwmond"
  54 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  55 +DAEMON="/usr/bin/${DAEMON_NAME}"
  56  PIDFILE="/var/run/${DAEMON_NAME}.pid"
  57
  58  # Linux Standard Base (LSB) Error Codes
  59 diff --git a/hwmon/scripts/ocf/hwmon b/hwmon/scripts/ocf/hwmon
  60 index 14f52a2..b71a77f 100644
  61 --- a/hwmon/scripts/ocf/hwmon
  62 +++ b/hwmon/scripts/ocf/hwmon
  63 @@ -45,7 +45,7 @@ OCF_RESKEY_state_default="standby"
  64  : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
  65  : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
  66
  67 -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
  68 +mydaemon="/usr/bin/${OCF_RESKEY_binary}"
  69  statusfile="/var/run/${OCF_RESKEY_binary}.info"
  70
  71  #######################################################################
  72 @@ -157,9 +157,9 @@ hwmond_validate() {
  73          ocf_log info "hwmond:validate"
  74     fi
  75
  76 -    check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
  77 -    check_binary "/usr/local/bin/mtcAgent"
  78 -    check_binary "/usr/local/bin/mtcClient"
  79 +    check_binary "/usr/bin/${OCF_RESKEY_binary}"
  80 +    check_binary "/usr/bin/mtcAgent"
  81 +    check_binary "/usr/bin/mtcClient"
  82      check_binary sysinv-api
  83      check_binary pidof
  84
  85 diff --git a/lmon/scripts/lmon b/lmon/scripts/lmon
  86 index 6024e16..21538ee 100644
  87 --- a/lmon/scripts/lmon
  88 +++ b/lmon/scripts/lmon
  89 @@ -20,7 +20,7 @@
  90  . /etc/init.d/functions
  91
  92  DAEMON_NAME="lmond"
  93 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  94 +DAEMON="/usr/bin/${DAEMON_NAME}"
  95  IFACE=""
  96
  97  if [ ! -e "$DAEMON" ] ; then
  98 diff --git a/maintenance/mtcCompMsg.cpp b/maintenance/mtcCompMsg.cpp
  99 index b5b221e..daaea9b 100755
 100 --- a/maintenance/mtcCompMsg.cpp
 101 +++ b/maintenance/mtcCompMsg.cpp
 102 @@ -541,7 +541,7 @@ int mtc_service_command ( mtc_socket_type * sock_ptr, int interface )
 103              {
 104                  ilog ("Disk wipe in progress (%s)\n", interface_name.c_str());
 105                  daemon_log ( NODE_RESET_FILE, "wipedisk command" );
 106 -                rc = system("/usr/local/bin/wipedisk --force");
 107 +                rc = system("/usr/bin/wipedisk --force");
 108                  ilog ("Disk wipe complete - Forcing Reboot ...\n");
 109                  rc = system("/usr/bin/systemctl reboot --force");
 110                  exit (0);
 111 diff --git a/pmon/scripts/pmon b/pmon/scripts/pmon
 112 index bdc3ab7..4cb813e 100644
 113 --- a/pmon/scripts/pmon
 114 +++ b/pmon/scripts/pmon
 115 @@ -17,12 +17,12 @@
 116  # Short-Description: process Monitor daemon
 117  ### END INIT INFO
 118
 119 -# echo "7:3:respawn:/usr/local/bin/pmond" >> /etc/inittab
 120 +# echo "7:3:respawn:/usr/bin/pmond" >> /etc/inittab
 121
 122  . /etc/init.d/functions
 123
 124  DAEMON_NAME="pmond"
 125 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
 126 +DAEMON="/usr/bin/${DAEMON_NAME}"
 127  IFACE=""
 128
 129  if [ ! -e "$DAEMON" ] ; then
 130 diff --git a/scripts/hbsAgent b/scripts/hbsAgent
 131 index d1a2f4f..e8157f0 100755
 132 --- a/scripts/hbsAgent
 133 +++ b/scripts/hbsAgent
 134 @@ -43,7 +43,7 @@ OCF_RESKEY_state_default="active"
 135  : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
 136  : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
 137
 138 -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
 139 +mydaemon="/usr/bin/${OCF_RESKEY_binary}"
 140  statusfile="/var/run/${OCF_RESKEY_binary}.info"
 141  virtualhostfile="/var/run/virtual.host"
 142  facterexec="/usr/bin/facter"
 143 @@ -148,8 +148,8 @@ hbsAgent_validate() {
 144          ocf_log info "hbsAgent:validate"
 145      fi
 146
 147 -    check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
 148 -    check_binary "/usr/local/bin/mtcAgent"
 149 +    check_binary "/usr/bin/${OCF_RESKEY_binary}"
 150 +    check_binary "/usr/bin/mtcAgent"
 151      check_binary pidof
 152
 153      if [ ! -f ${OCF_RESKEY_config} ] ; then
 154 diff --git a/scripts/hbsClient b/scripts/hbsClient
 155 index 67d7e84..7c412b1 100644
 156 --- a/scripts/hbsClient
 157 +++ b/scripts/hbsClient
 158 @@ -20,7 +20,7 @@
 159  . /etc/init.d/functions
 160
 161  DAEMON_NAME="hbsClient"
 162 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
 163 +DAEMON="/usr/bin/${DAEMON_NAME}"
 164  PIDFILE="/var/run/${DAEMON_NAME}.pid"
 165  IFACE=""
 166
 167 diff --git a/scripts/mtcAgent b/scripts/mtcAgent
 168 index 6e75ace..885bd3d 100755
 169 --- a/scripts/mtcAgent
 170 +++ b/scripts/mtcAgent
 171 @@ -45,7 +45,7 @@ OCF_RESKEY_state_default="standby"
 172  : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
 173  : ${OCF_RESKEY_state=${OCF_RESKEY_state_default}}
 174
 175 -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
 176 +mydaemon="/usr/bin/${OCF_RESKEY_binary}"
 177  statusfile="/var/run/${OCF_RESKEY_binary}.info"
 178
 179  #######################################################################
 180 @@ -157,10 +157,10 @@ mtcAgent_validate() {
 181          ocf_log info "mtcAgent:validate"
 182     fi
 183
 184 -    check_binary "/usr/local/bin/${OCF_RESKEY_binary}"
 185 -    check_binary "/usr/local/bin/hbsAgent"
 186 -    check_binary "/usr/local/bin/mtcClient"
 187 -    check_binary "/usr/local/bin/hbsClient"
 188 +    check_binary "/usr/bin/${OCF_RESKEY_binary}"
 189 +    check_binary "/usr/bin/hbsAgent"
 190 +    check_binary "/usr/bin/mtcClient"
 191 +    check_binary "/usr/bin/hbsClient"
 192      check_binary sysinv-api
 193      check_binary pidof
 194
 195 diff --git a/scripts/mtcClient b/scripts/mtcClient
 196 index 1113689..de4f407 100644
 197 --- a/scripts/mtcClient
 198 +++ b/scripts/mtcClient
 199 @@ -20,7 +20,7 @@
 200  . /etc/init.d/functions
 201
 202  DAEMON_NAME="mtcClient"
 203 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
 204 +DAEMON="/usr/bin/${DAEMON_NAME}"
 205  PIDFILE="/var/run/${DAEMON_NAME}.pid"
 206  PLATFORM_CONF="/etc/platform/platform.conf"
 207
 208 diff --git a/scripts/mtcinit b/scripts/mtcinit
 209 index 8ff9bbb..4672e2f 100755
 210 --- a/scripts/mtcinit
 211 +++ b/scripts/mtcinit
 212 @@ -9,10 +9,10 @@
 213  . /etc/init.d/functions
 214
 215  MTCCLIENT_NAME="mtcClient"
 216 -MTCCLIENT="/usr/local/bin/${MTCCLIENT_NAME}"
 217 +MTCCLIENT="/usr/bin/${MTCCLIENT_NAME}"
 218
 219  HBSCLIENT_NAME="hbsClient"
 220 -HBSCLIENT="/usr/local/bin/${HBSCLIENT_NAME}"
 221 +HBSCLIENT="/usr/bin/${HBSCLIENT_NAME}"
 222
 223  IFACE=""
 224
 225 diff --git a/scripts/mtclog b/scripts/mtclog
 226 index 80db22a..f904c4d 100644
 227 --- a/scripts/mtclog
 228 +++ b/scripts/mtclog
 229 @@ -22,7 +22,7 @@
 230  . /etc/init.d/functions
 231
 232  DAEMON_NAME="mtclogd"
 233 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
 234 +DAEMON="/usr/bin/${DAEMON_NAME}"
 235  PIDFILE="/var/run/${DAEMON_NAME}.pid"
 236  PLATFORM_CONF="/etc/platform/platform.conf"
 237