summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>2018-12-12 21:30:30 +0530
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-12-18 12:47:39 +0000
commit4b5a9efd23fe3eeabac9b77f1bd7a528e7c88933 (patch)
treed1e62a71dfabf6e3076114326ac5b25979fd6ae3
parent98c2e8d0aaf4c3bcdbcfece3d03b6d70da0530c5 (diff)
downloadtalos-openbmc-4b5a9efd23fe3eeabac9b77f1bd7a528e7c88933.tar.gz
talos-openbmc-4b5a9efd23fe3eeabac9b77f1bd7a528e7c88933.zip
Setting root password moved to distro
Moved setting default root user password to distro instead of applying it in every conf. Unit-test: Verified /etc/shadow file updated accordingly. (From meta-phosphor rev: fd1f696f99eb61fa764d8438f635c6d6a558973d) Change-Id: I652273b157102600c108d3a547613c11f774aad4 Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
-rw-r--r--meta-phosphor/conf/distro/include/phosphor-defaults.inc7
-rw-r--r--meta-phosphor/conf/local.conf.sample4
2 files changed, 7 insertions, 4 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index ed2cd741d..565921580 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -244,3 +244,10 @@ OBMC_DBUS_IFACE_ROOT ?= "xyz.openbmc_project"
# Will add a build dependency to host-ipmid on the
# phosphor-ipmi-fru-whitelist-native recipe.
VIRTUAL-RUNTIME_phosphor-ipmi-providers ?= "phosphor-ipmi-fru"
+
+# Set the root password to '0penBmc'
+inherit extrausers
+
+EXTRA_USERS_PARAMS = " \
+ usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
+ "
diff --git a/meta-phosphor/conf/local.conf.sample b/meta-phosphor/conf/local.conf.sample
index 15e324311..d77fc8ad7 100644
--- a/meta-phosphor/conf/local.conf.sample
+++ b/meta-phosphor/conf/local.conf.sample
@@ -15,9 +15,5 @@ BB_DISKMON_DIRS = "\
ABORT,${SSTATE_DIR},100M,1K \
ABORT,/tmp,10M,1K"
CONF_VERSION = "1"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"
OpenPOWER on IntegriCloud