meta-starlingx/meta-stx-flock/stx-nfv/files/0003-guest-agent-server-fix-daemon-paths.patch

   1 diff --git a/mtce-guest/src/scripts/guestAgent b/mtce-guest/src/scripts/guestAgent
   2 index a0a7b0e..41b5559 100644
   3 --- a/mtce-guest/src/scripts/guestAgent
   4 +++ b/mtce-guest/src/scripts/guestAgent
   5 @@ -20,7 +20,7 @@
   6  . /etc/init.d/functions
   7
   8  DAEMON_NAME="guestAgent"
   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/mtce-guest/src/scripts/guestAgent.service b/mtce-guest/src/scripts/guestAgent.service
  15 index 5a54ba7..c447305 100644
  16 --- a/mtce-guest/src/scripts/guestAgent.service
  17 +++ b/mtce-guest/src/scripts/guestAgent.service
  18 @@ -7,7 +7,7 @@ Type=forking
  19  ExecStart=/etc/init.d/guestAgent start
  20  ExecStop=/etc/init.d/guestAgent stop
  21  ExecReload=/etc/init.d/guestAgent reload
  22 -PIDFile=/var/run/guestAgent.pid
  23 +PIDFile=/run/guestAgent.pid
  24
  25  Restart=no
  26
  27 diff --git a/mtce-guest/src/scripts/guestServer b/mtce-guest/src/scripts/guestServer
  28 index ace6a41..1008ad5 100644
  29 --- a/mtce-guest/src/scripts/guestServer
  30 +++ b/mtce-guest/src/scripts/guestServer
  31 @@ -20,7 +20,7 @@
  32  . /etc/init.d/functions
  33
  34  DAEMON_NAME="guestServer"
  35 -DAEMON="/usr/local/bin/${DAEMON_NAME}"
  36 +DAEMON="/usr/bin/${DAEMON_NAME}"
  37  PIDFILE="/var/run/${DAEMON_NAME}.pid"
  38  PLATFORM_CONF="/etc/platform/platform.conf"
  39
  40 diff --git a/mtce-guest/src/scripts/guestServer.service b/mtce-guest/src/scripts/guestServer.service
  41 index 1feb327..7a63e6a 100644
  42 --- a/mtce-guest/src/scripts/guestServer.service
  43 +++ b/mtce-guest/src/scripts/guestServer.service
  44 @@ -8,7 +8,7 @@ Type=forking
  45  ExecStart=/etc/init.d/guestServer start
  46  ExecStop=/etc/init.d/guestServer stop
  47  ExecReload=/etc/init.d/guestServer reload
  48 -PIDFile=/var/run/guestServer.pid
  49 +PIDFile=/run/guestServer.pid
  50
  51  # Failure handling
  52  TimeoutStartSec=10s