Code Review
/
pti
/
rtp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "fm-mgr: fix to avoid useradd error"
[pti/rtp.git]
/
meta-stx
/
conf
/
distro
/
poky-stx.conf
diff --git
a/meta-stx/conf/distro/poky-stx.conf
b/meta-stx/conf/distro/poky-stx.conf
index
119c416
..
869866a
100644
(file)
--- a/
meta-stx/conf/distro/poky-stx.conf
+++ b/
meta-stx/conf/distro/poky-stx.conf
@@
-38,6
+38,9
@@
SYSTEMD_AUTO_ENABLE_pn-postgresql = "disable"
# networking sysv service is required
SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking"
# networking sysv service is required
SYSTEMD_DISABLED_SYSV_SERVICES_remove = "networking"
+# Defines the serial consoles (TTYs) to enable using getty
+SERIAL_CONSOLES = "115200;ttyS0"
+
# /var/log is mounted as a logical volume for stx,
# so do not link to /var/volatile/log.
VOLATILE_LOG_DIR = "no"
# /var/log is mounted as a logical volume for stx,
# so do not link to /var/volatile/log.
VOLATILE_LOG_DIR = "no"
@@
-46,7
+49,6
@@
VOLATILE_LOG_DIR = "no"
IMAGE_OVERHEAD_FACTOR = "1.05"
# Add extra users and groups for stx
IMAGE_OVERHEAD_FACTOR = "1.05"
# Add extra users and groups for stx
-INHERIT += " extrausers-config"
SYSADMIN_P = "4SuW8cnXFyxsk"
EXTRA_USERS_PARAMS_CONFIG = "\
SYSADMIN_P = "4SuW8cnXFyxsk"
EXTRA_USERS_PARAMS_CONFIG = "\
@@
-54,12
+56,6
@@
EXTRA_USERS_PARAMS_CONFIG = "\
useradd -m -g sys_protected -G root \
-d /home/sysadmin -p ${SYSADMIN_P} \
-s /bin/sh sysadmin; \
useradd -m -g sys_protected -G root \
-d /home/sysadmin -p ${SYSADMIN_P} \
-s /bin/sh sysadmin; \
- useradd -p '' sysinv; \
- groupadd sysinv; \
- usermod -a -G sysinv sysinv; \
- useradd -p '' ceph; \
- groupadd ceph; \
- usermod -a -G ceph ceph; \
useradd -p '' haproxy; \
groupadd haproxy; \
usermod -a -G haproxy haproxy; \
useradd -p '' haproxy; \
groupadd haproxy; \
usermod -a -G haproxy haproxy; \
@@
-78,6
+74,7
@@
EXTRA_USERS_PARAMS_CONFIG = "\
usermod -a -G sys_protected nfv; \
usermod -a -G sys_protected patching; \
usermod -a -G sys_protected haproxy; \
usermod -a -G sys_protected nfv; \
usermod -a -G sys_protected patching; \
usermod -a -G sys_protected haproxy; \
+ usermod -a -G snmpd fm; \
usermod -P root root; \
\
groupadd -r -g 128 nscd; \
usermod -P root root; \
\
groupadd -r -g 128 nscd; \