- There is an issue with upgrading packages from 0.4.0 to 0.4.2 or later where we've renamed the agent daemons. Original naming scheme was `matahari-<agent>d` whereas the new binaries are named `matahari-qmf-<agent>d` to differentiate between dbus and qmf. So we want to make sure that anyone upgrading from 0.4.0 will properly have their old services cleaned up.
Signed-off-by: Adam Stokes astokes@fedoraproject.org --- matahari.init.in | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/matahari.init.in b/matahari.init.in index 75f9739..8a3cc1c 100644 --- a/matahari.init.in +++ b/matahari.init.in @@ -26,6 +26,10 @@
SERVICE=matahari-@BASE@@BASE_SUB@ PROCESS=matahari-qmf-@BASE@@BASE_SUB@d +# Old process naming convention, this is here +# for compability sake when starting/stopping the +# service from an upgrade of 0.4.0 > 0.4.2 +OLDPROCESS=matahari-@BASE@@BASE_SUB@d
RETVAL=0
@@ -51,8 +55,16 @@ start() { stop() { echo -n $"Stopping the $SERVICE daemon: "
- killproc $PROCESS + # Check for OLDPROCESS for pre 0.4.2 compat + pidofproc $OLDPROCESS >/dev/null RETVAL=$? + if [ $RETVAL -lt 3 ]; then + killproc $OLDPROCESS + RETVAL=$? + else + killproc $PROCESS + RETVAL=$? + fi echo if [ $RETVAL -eq 0 ]; then rm -f @localstatedir@/lock/subsys/$SERVICE
Ack.
On 15/09/11 23:04, Adam Stokes wrote:
- There is an issue with upgrading packages from 0.4.0 to 0.4.2 or later where we've renamed the agent daemons. Original naming scheme was `matahari-<agent>d` whereas the new binaries are named `matahari-qmf-<agent>d` to differentiate between dbus and qmf. So we want to make sure that anyone upgrading from 0.4.0 will properly have their old services cleaned up.
Signed-off-by: Adam Stokesastokes@fedoraproject.org
matahari.init.in | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/matahari.init.in b/matahari.init.in index 75f9739..8a3cc1c 100644 --- a/matahari.init.in +++ b/matahari.init.in @@ -26,6 +26,10 @@
SERVICE=matahari-@BASE@@BASE_SUB@ PROCESS=matahari-qmf-@BASE@@BASE_SUB@d +# Old process naming convention, this is here +# for compability sake when starting/stopping the +# service from an upgrade of 0.4.0> 0.4.2 +OLDPROCESS=matahari-@BASE@@BASE_SUB@d
RETVAL=0
@@ -51,8 +55,16 @@ start() { stop() { echo -n $"Stopping the $SERVICE daemon: "
- killproc $PROCESS
- # Check for OLDPROCESS for pre 0.4.2 compat
- pidofproc $OLDPROCESS>/dev/null RETVAL=$?
- if [ $RETVAL -lt 3 ]; then
killproc $OLDPROCESS
RETVAL=$?
- else
killproc $PROCESS
RETVAL=$?
- fi echo if [ $RETVAL -eq 0 ]; then rm -f @localstatedir@/lock/subsys/$SERVICE
matahari@lists.fedorahosted.org