[yocto] [meta-cgl][PATCH 3/3] cluster-glue: update useradd parameters

[jackie.huang at windriver.com]

From: Jackie Huang <jackie.huang at windriver.com>

Update useradd parameters for cluster-glue according
to spec file from source code:

https://github.com/ClusterLabs/cluster-glue/blob/master/cluster-glue-fedora.spec

And use HA_USER and HA_GROUP for easy maintenance.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Jackie Huang <jackie.huang at windriver.com>
---
 .../recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
index b5cf997..783469d 100644
--- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb
@@ -27,18 +27,26 @@ inherit autotools useradd pkgconfig systemd
 SYSTEMD_SERVICE_${PN} = "logd.service"
 SYSTEMD_AUTO_ENABLE = "disable"
 
+HA_USER = "hacluster"
+HA_GROUP = "haclient"
+
 S = "${WORKDIR}/Reusable-Cluster-Components-glue--glue-${PV}"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,systemd"
 
-EXTRA_OECONF = "--with-daemon-user=hacluster --with-daemon-group=haclient --disable-fatal-warnings"
+EXTRA_OECONF = "--with-daemon-user=${HA_USER} \
+                --with-daemon-group=${HA_GROUP} \
+                --disable-fatal-warnings \
+               "
 
 CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0"
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat -g haclient -r hacluster"
-GROUPADD_PARAM_${PN} = "-r haclient"
+USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \
+                       -g ${HA_GROUP} -r -s ${sbindir}/nologin -c 'cluster user' ${HA_USER} \
+                      "
+GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}"
 
 do_configure_prepend() {
     ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml
-- 
2.11.0