starlingx/meta-starlingx
Code Issues Proposed changes

sysinv: inherit useradd to add user and group

Browse Source 
- stx 3.0 needs the 'sysinv' user/group created with id 168,
  which maybe occupied by other user/group, so change to
  inherit useradd in sysinv recipe to avoid such issue.
- reset the id for rpc and snmpd to align stx3.0
  and avoid conflicts.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Jackie Huang 2020-04-29 15:55:49 +08:00 committed by Babak Sarashki
parent 336f9475df
commit d9f53a89a8
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
meta-stx-distro/conf/distro/poky-stx.conf
View File

@ -38,9 +38,6 @@ EXTRA_USERS_PARAMS_CONFIG = "\
useradd -m -g sys_protected -G root \ useradd -m -g sys_protected -G root \
-d /home/sysadmin -p ${SYSADMIN_P} \ -d /home/sysadmin -p ${SYSADMIN_P} \
-s /bin/sh sysadmin; \ -s /bin/sh sysadmin; \
useradd -p '' sysinv; \
groupadd sysinv; \
usermod -a -G sysinv sysinv; \
useradd -p '' ceph; \ useradd -p '' ceph; \
groupadd ceph; \ groupadd ceph; \
usermod -a -G ceph ceph; \ usermod -a -G ceph ceph; \

6
meta-stx-flock/stx-config/sysinv.bb
View File

@ -52,10 +52,14 @@ RDEPENDS_${PN}_append = " \
gptfdisk \ gptfdisk \
" "
inherit setuptools python-dir systemd inherit setuptools python-dir systemd useradd
SYSTEMD_PACKAGES += "${PN}" SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = "sysinv-api.service sysinv-conductor.service" SYSTEMD_SERVICE_${PN} = "sysinv-api.service sysinv-conductor.service"
USERADD_PACKAGES = "sysinv"
USERADD_PARAM_sysinv = "-r -g sysinv -u 168 -d /var/lib/sysinv -s /sbin/nologin -c 'sysinv Daemons' sysinv"
GROUPADD_PARAM_sysinv = "-r -g 168 sysinv"
do_install_append() { do_install_append() {
install -d -m 755 ${D}${sysconfdir}/goenabled.d install -d -m 755 ${D}${sysconfdir}/goenabled.d

2
meta-stx-integ/recipes-extended/rpcbind/rpcbind_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
USERADD_PARAM_${PN} = "-r -g rpc -u 32 -d /var/lib/rpcbind -s /sbin/nologin -c 'Rpcbind Daemons' rpc"
GROUPADD_PARAM_${PN} = "-r -g 32 rpc"

4
meta-stx-integ/recipes-protocols/net-snmp/net-snmp_%.bbappend
View File

@ -1,5 +1,5 @@
inherit useradd inherit useradd
USERADD_PACKAGES = "net-snmp-server-snmpd" USERADD_PACKAGES = "net-snmp-server-snmpd"
USERADD_PARAM_net-snmp-server-snmpd = "-r -g snmpd -u 169 -d /usr/share/snmp -s /sbin/nologin -c 'net-snmp' snmpd" USERADD_PARAM_net-snmp-server-snmpd = "-r -g snmpd -d /usr/share/snmp -s /sbin/nologin -c 'net-snmp' snmpd"
GROUPADD_PARAM_net-snmp-server-snmpd = "-r -g 169 snmpd" GROUPADD_PARAM_net-snmp-server-snmpd = "-r snmpd"