[oe] [meta-erlang][PATCH] rabbitmq-server: correct some sysvinit issues

[Thomas Perrot]

- When the sysvinit distro feature is used, if the log directory doesn’t exist
  the script “rabbitmq-server-setup” is called, as for the systemd’s service.
- When the rabbitmq-sercer process is started successfully the return code is 69
  instead of 0.

Signed-off-by: Thomas Perrot <thomas.per...@bootlin.com>
---
 recipes-connectivity/rabbitmq/files/rabbitmq-server    | 9 ++++-----
 recipes-connectivity/rabbitmq/rabbitmq-server_3.8.3.bb | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/recipes-connectivity/rabbitmq/files/rabbitmq-server 
b/recipes-connectivity/rabbitmq/files/rabbitmq-server
index bffd4ce..2540fc1 100644
--- a/recipes-connectivity/rabbitmq/files/rabbitmq-server
+++ b/recipes-connectivity/rabbitmq/files/rabbitmq-server
@@ -16,10 +16,7 @@
 # Short-Description: Enable AMQP service provided by RabbitMQ broker
 ### END INIT INFO
 
-# Ensure that HOME is set, since the erlang ookie file must be written
-# somewhere
-export HOME=%ROOT_HOME%
-
+SETUP=/usr/bin/rabbitmq-server-setup
 DAEMON=/usr/bin/rabbitmq-server
 CONTROL=/usr/bin/rabbitmqctl
 USER=rabbitmq
@@ -62,7 +59,7 @@ start_rabbitmq () {
         RETVAL=$?
         set -e
         case "$RETVAL" in
-            0)
+            69)
                 echo SUCCESS
                 if [ -n "$LOCK_FILE" ] ; then
                     touch $LOCK_FILE
@@ -141,6 +138,8 @@ restart_rabbitmq() {
     start_rabbitmq
 }
 
+source $SETUP
+
 case "$1" in
     start)
         echo -n "Starting $DESC: "
diff --git a/recipes-connectivity/rabbitmq/rabbitmq-server_3.8.3.bb 
b/recipes-connectivity/rabbitmq/rabbitmq-server_3.8.3.bb
index 864810b..6ca11bb 100644
--- a/recipes-connectivity/rabbitmq/rabbitmq-server_3.8.3.bb
+++ b/recipes-connectivity/rabbitmq/rabbitmq-server_3.8.3.bb
@@ -87,17 +87,17 @@ do_install() {
     install -m 644 ${WORKDIR}/rabbitmq.conf 
${D}/${sysconfdir}/rabbitmq/rabbitmq.conf
     chown root.rabbitmq ${D}/${sysconfdir}/rabbitmq/rabbitmq.conf
 
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/rabbitmq-server-setup ${D}${bindir}
+
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', 
d)}; then
         install -d ${D}${sysconfdir}/init.d
         install -m 0755 ${WORKDIR}/rabbitmq-server 
${D}${sysconfdir}/init.d/rabbitmq-server
-        sed -e "s:%ROOT_HOME%:/var/lib/rabbitmq:" -i 
${D}${sysconfdir}/init.d/rabbitmq-server
     fi
 
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; 
then
         install -d ${D}${systemd_unitdir}/system
         install -m 0644 ${WORKDIR}/rabbitmq-server.service 
${D}${systemd_unitdir}/system
-       install -d ${D}${bindir}
-       install -m 0755 ${WORKDIR}/rabbitmq-server-setup ${D}${bindir}
     fi
 }
 
-- 
2.29.2


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#88595): 
https://lists.openembedded.org/g/openembedded-devel/message/88595
Mute This Topic: https://lists.openembedded.org/mt/79495584/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-