[yocto] [meta-cgl][PATCH 2/5] openais: correct the use of proc name in init script
jackie.huang at windriver.com
jackie.huang at windriver.com
Fri May 26 01:46:12 PDT 2017
From: Jackie Huang <jackie.huang at windriver.com>
openais actually runs on top of corosync. The init
script was checking for the pid of "openais"
rather than checking for corosync's pid.
Signed-off-by: Aws Ismail <aws.ismail at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
.../openais/files/openais-fix-init-script.patch | 42 ++++++++++++++++++++++
.../recipes-cgl/openais/openais_1.1.4.bb | 1 +
2 files changed, 43 insertions(+)
create mode 100644 meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch
diff --git a/meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch
new file mode 100644
index 0000000..69fddd5
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/openais/files/openais-fix-init-script.patch
@@ -0,0 +1,42 @@
+commit 367f4ab0b67266e07ffedcae2df74f2576ea2aeb
+Author: Aws Ismail <aws.ismail at windriver.com>
+Date: Thu Jan 24 12:36:48 2013 -0500
+
+ openais: correct the use of proc name in init script
+
+ openais actually runs on top of corosync. The init
+ script was checking for the pid of "openais"
+ rather than checking for corosync's pid.
+
+ Upstream-Status: Pending
+
+ Signed-off-by: Aws Ismail <aws.ismail at windriver.com>
+
+diff --git a/init/generic.in b/init/generic.in
+index ac63a5f..e8efbb3 100644
+--- a/init/generic.in
++++ b/init/generic.in
+@@ -46,7 +46,7 @@ status()
+ if [ $rtrn -ne 0 ]; then
+ echo "$1 is stopped"
+ else
+- echo "$1 (pid $pid) is running..."
++ echo "$1 ($proc with pid $pid) is running..."
+ fi
+ return $rtrn
+ }
+@@ -130,12 +130,12 @@ restart|reload|force-reload)
+ restart
+ ;;
+ condrestart|try-restart)
+- if status $prog > /dev/null 2>&1; then
++ if status $proc > /dev/null 2>&1; then
+ restart
+ fi
+ ;;
+ status)
+- status $prog
++ status $proc
+ rtrn=$?
+ ;;
+ stop)
diff --git a/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
index 23da0a2..0693ddb 100644
--- a/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
+++ b/meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
file://fix-lcrso-linkage.patch \
file://build-cleanup-configure-ac.patch \
file://openais-fix-bash.patch \
+ file://openais-fix-init-script.patch \
file://openais.service \
"
--
2.11.0
More information about the yocto
mailing list