summaryrefslogtreecommitdiff
path: root/meta-evb
diff options
context:
space:
mode:
authorJoseph Reynolds <joseph-reynolds@charter.net>2021-08-04 18:01:42 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-08-10 14:13:37 +0300
commit516363e50000bf4c41a32dbe521ce50727eaded2 (patch)
tree0c3707eb1dceac90410d112eb0a5118b42c11fde /meta-evb
parent959379abc1f2279ebc0a102b4091b0d775781747 (diff)
downloadopenbmc-516363e50000bf4c41a32dbe521ce50727eaded2.tar.xz
Remove redundant code to set root password
Background: The OpenBmc project default root account password is set in meta-phosphor/conf/distro/include/phosphor-defaults.inc and can be customized in each layer's local.conf file. Many of these local.conf.sample files had redundant code to set the password, which probably should not have been there. Removing them allows the defaults in phosphor-defaults.inc to take effect. Tested: No. Only meta-ibm was tested. Signed-off-by: Joseph Reynolds <joseph-reynolds@charter.net> Change-Id: I76dce00d269d7afa005d7bcfd63f846d3cf45596
Diffstat (limited to 'meta-evb')
-rw-r--r--meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample5
-rw-r--r--meta-evb/meta-evb-raspberrypi/conf/local.conf.sample5
2 files changed, 2 insertions, 8 deletions
diff --git a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample
index e65be03f9..e1de4843c 100644
--- a/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample
+++ b/meta-evb/meta-evb-enclustra/meta-evb-zx3-pm3/conf/local.conf.sample
@@ -17,7 +17,4 @@ BB_DISKMON_DIRS = "\
CONF_VERSION = "1"
# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
+# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc
diff --git a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample
index b73edee35..a33ae30cf 100644
--- a/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample
+++ b/meta-evb/meta-evb-raspberrypi/conf/local.conf.sample
@@ -17,9 +17,6 @@ BB_DISKMON_DIRS = "\
CONF_VERSION = "1"
# Set the root password to '0penBmc'
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
+# Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc
require conf/machine/include/obmc-bsp-common.inc