1 diff --git a/mtce/src/alarm/scripts/mtcalarm.init b/mtce/src/alarm/scripts/mtcalarm.init
2 index 57f348f..419da8a 100644
3 --- a/mtce/src/alarm/scripts/mtcalarm.init
4 +++ b/mtce/src/alarm/scripts/mtcalarm.init
6 . /etc/init.d/functions
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"
14 diff --git a/mtce/src/fsmon/scripts/fsmon b/mtce/src/fsmon/scripts/fsmon
15 index 6d8abcc..de9da01 100644
16 --- a/mtce/src/fsmon/scripts/fsmon
17 +++ b/mtce/src/fsmon/scripts/fsmon
19 . /etc/init.d/functions
22 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
23 +DAEMON="/usr/bin/${DAEMON_NAME}"
24 PIDFILE="/var/run/${DAEMON_NAME}.pid"
26 # Linux Standard Base (LSB) Error Codes
27 diff --git a/mtce/src/hostw/scripts/hostw b/mtce/src/hostw/scripts/hostw
28 index 82a4aaf..4946092 100644
29 --- a/mtce/src/hostw/scripts/hostw
30 +++ b/mtce/src/hostw/scripts/hostw
32 # Short-Description: host watchdog daemon
35 -# echo "7:3:respawn:/usr/local/bin/hostwd" >> /etc/inittab
36 +# echo "7:3:respawn:/usr/bin/hostwd" >> /etc/inittab
38 . /etc/init.d/functions
41 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
42 +DAEMON="/usr/bin/${DAEMON_NAME}"
45 if [ ! -e "$DAEMON" ] ; then
46 diff --git a/mtce/src/hwmon/scripts/lsb/hwmon b/mtce/src/hwmon/scripts/lsb/hwmon
47 index 4596a36..ba459c1 100644
48 --- a/mtce/src/hwmon/scripts/lsb/hwmon
49 +++ b/mtce/src/hwmon/scripts/lsb/hwmon
51 . /etc/init.d/functions
54 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
55 +DAEMON="/usr/bin/${DAEMON_NAME}"
56 PIDFILE="/var/run/${DAEMON_NAME}.pid"
58 # Linux Standard Base (LSB) Error Codes
59 diff --git a/mtce/src/hwmon/scripts/ocf/hwmon b/mtce/src/hwmon/scripts/ocf/hwmon
60 index 14f52a2..b71a77f 100644
61 --- a/mtce/src/hwmon/scripts/ocf/hwmon
62 +++ b/mtce/src/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}}
67 -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
68 +mydaemon="/usr/bin/${OCF_RESKEY_binary}"
69 statusfile="/var/run/${OCF_RESKEY_binary}.info"
71 #######################################################################
72 @@ -157,9 +157,9 @@ hwmond_validate() {
73 ocf_log info "hwmond:validate"
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
85 diff --git a/mtce/src/lmon/scripts/lmon b/mtce/src/lmon/scripts/lmon
86 index 6024e16..21538ee 100644
87 --- a/mtce/src/lmon/scripts/lmon
88 +++ b/mtce/src/lmon/scripts/lmon
90 . /etc/init.d/functions
93 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
94 +DAEMON="/usr/bin/${DAEMON_NAME}"
97 if [ ! -e "$DAEMON" ] ; then
98 diff --git a/mtce/src/maintenance/mtcCompMsg.cpp b/mtce/src/maintenance/mtcCompMsg.cpp
99 index b5b221e..daaea9b 100755
100 --- a/mtce/src/maintenance/mtcCompMsg.cpp
101 +++ b/mtce/src/maintenance/mtcCompMsg.cpp
102 @@ -541,7 +541,7 @@ int mtc_service_command ( mtc_socket_type * sock_ptr, int interface )
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");
111 diff --git a/mtce/src/pmon/scripts/pmon b/mtce/src/pmon/scripts/pmon
112 index bdc3ab7..4cb813e 100644
113 --- a/mtce/src/pmon/scripts/pmon
114 +++ b/mtce/src/pmon/scripts/pmon
116 # Short-Description: process Monitor daemon
119 -# echo "7:3:respawn:/usr/local/bin/pmond" >> /etc/inittab
120 +# echo "7:3:respawn:/usr/bin/pmond" >> /etc/inittab
122 . /etc/init.d/functions
125 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
126 +DAEMON="/usr/bin/${DAEMON_NAME}"
129 if [ ! -e "$DAEMON" ] ; then
130 diff --git a/mtce/src/scripts/hbsAgent b/mtce/src/scripts/hbsAgent
131 index d1a2f4f..e8157f0 100755
132 --- a/mtce/src/scripts/hbsAgent
133 +++ b/mtce/src/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}}
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"
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"
153 if [ ! -f ${OCF_RESKEY_config} ] ; then
154 diff --git a/mtce/src/scripts/hbsClient b/mtce/src/scripts/hbsClient
155 index 67d7e84..7c412b1 100644
156 --- a/mtce/src/scripts/hbsClient
157 +++ b/mtce/src/scripts/hbsClient
159 . /etc/init.d/functions
161 DAEMON_NAME="hbsClient"
162 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
163 +DAEMON="/usr/bin/${DAEMON_NAME}"
164 PIDFILE="/var/run/${DAEMON_NAME}.pid"
167 diff --git a/mtce/src/scripts/mtcAgent b/mtce/src/scripts/mtcAgent
168 index 6e75ace..885bd3d 100755
169 --- a/mtce/src/scripts/mtcAgent
170 +++ b/mtce/src/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}}
175 -mydaemon="/usr/local/bin/${OCF_RESKEY_binary}"
176 +mydaemon="/usr/bin/${OCF_RESKEY_binary}"
177 statusfile="/var/run/${OCF_RESKEY_binary}.info"
179 #######################################################################
180 @@ -157,10 +157,10 @@ mtcAgent_validate() {
181 ocf_log info "mtcAgent:validate"
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
195 diff --git a/mtce/src/scripts/mtcClient b/mtce/src/scripts/mtcClient
196 index 1113689..de4f407 100644
197 --- a/mtce/src/scripts/mtcClient
198 +++ b/mtce/src/scripts/mtcClient
200 . /etc/init.d/functions
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"
208 diff --git a/mtce/src/scripts/mtcinit b/mtce/src/scripts/mtcinit
209 index 8ff9bbb..4672e2f 100755
210 --- a/mtce/src/scripts/mtcinit
211 +++ b/mtce/src/scripts/mtcinit
213 . /etc/init.d/functions
215 MTCCLIENT_NAME="mtcClient"
216 -MTCCLIENT="/usr/local/bin/${MTCCLIENT_NAME}"
217 +MTCCLIENT="/usr/bin/${MTCCLIENT_NAME}"
219 HBSCLIENT_NAME="hbsClient"
220 -HBSCLIENT="/usr/local/bin/${HBSCLIENT_NAME}"
221 +HBSCLIENT="/usr/bin/${HBSCLIENT_NAME}"
225 diff --git a/mtce/src/scripts/mtclog b/mtce/src/scripts/mtclog
226 index 80db22a..f904c4d 100644
227 --- a/mtce/src/scripts/mtclog
228 +++ b/mtce/src/scripts/mtclog
230 . /etc/init.d/functions
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"