summaryrefslogtreecommitdiff
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
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
-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
-rw-r--r--meta-facebook/meta-bletchley/conf/local.conf.sample6
-rw-r--r--meta-facebook/meta-tiogapass/conf/local.conf.sample6
-rw-r--r--meta-facebook/meta-yosemitev2/conf/local.conf.sample6
-rw-r--r--meta-hpe/meta-dl360poc/conf/local.conf.sample6
-rw-r--r--meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend1
-rw-r--r--meta-inspur/meta-on5263m5/conf/local.conf.sample5
-rwxr-xr-xmeta-microsoft/meta-olympus/conf/local.conf.sample6
-rw-r--r--meta-phosphor/conf/distro/include/phosphor-defaults.inc1
-rw-r--r--meta-portwell/meta-neptune/conf/local.conf.sample6
-rw-r--r--meta-supermicro/meta-x11spi/conf/local.conf.sample6
12 files changed, 12 insertions, 47 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
diff --git a/meta-facebook/meta-bletchley/conf/local.conf.sample b/meta-facebook/meta-bletchley/conf/local.conf.sample
index aeb3ae0b8..95c55352b 100644
--- a/meta-facebook/meta-bletchley/conf/local.conf.sample
+++ b/meta-facebook/meta-bletchley/conf/local.conf.sample
@@ -213,8 +213,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-facebook/meta-tiogapass/conf/local.conf.sample b/meta-facebook/meta-tiogapass/conf/local.conf.sample
index c7b9c3c64..5b8c9cd83 100644
--- a/meta-facebook/meta-tiogapass/conf/local.conf.sample
+++ b/meta-facebook/meta-tiogapass/conf/local.conf.sample
@@ -215,8 +215,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-facebook/meta-yosemitev2/conf/local.conf.sample b/meta-facebook/meta-yosemitev2/conf/local.conf.sample
index c9dffc2e4..069682d63 100644
--- a/meta-facebook/meta-yosemitev2/conf/local.conf.sample
+++ b/meta-facebook/meta-yosemitev2/conf/local.conf.sample
@@ -215,8 +215,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-hpe/meta-dl360poc/conf/local.conf.sample b/meta-hpe/meta-dl360poc/conf/local.conf.sample
index a111ba715..586cbd78e 100644
--- a/meta-hpe/meta-dl360poc/conf/local.conf.sample
+++ b/meta-hpe/meta-dl360poc/conf/local.conf.sample
@@ -237,8 +237,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
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-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 57260f06b..45061f767 100644
--- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -33,6 +33,7 @@ IMAGE_FEATURES_remove_witherspoon = "obmc-user-mgmt-ldap"
# The service account does not have a home directory. The home directory is
# set to / (the root directory) to allow dropbear ssh connections.
+# Override defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc
inherit extrausers
# The password hash used here is the traditional 0penBmc password.
diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample
index 56a7e9621..5defaa1d7 100644
--- a/meta-inspur/meta-on5263m5/conf/local.conf.sample
+++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample
@@ -234,7 +234,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
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-microsoft/meta-olympus/conf/local.conf.sample b/meta-microsoft/meta-olympus/conf/local.conf.sample
index ef46e0c03..dc18dce8b 100755
--- a/meta-microsoft/meta-olympus/conf/local.conf.sample
+++ b/meta-microsoft/meta-olympus/conf/local.conf.sample
@@ -237,8 +237,4 @@ PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
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-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 7aed7cbd4..e3eb454ae 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -243,6 +243,7 @@ SECURITY_CFLAGS_pn-pldm = ""
EXTRA_OEMESON_append_class-target = " -Db_lto=true"
# Set the root password to '0penBmc'
+# Override this in your local.conf
inherit extrausers
EXTRA_USERS_PARAMS_pn-obmc-phosphor-image = " \
diff --git a/meta-portwell/meta-neptune/conf/local.conf.sample b/meta-portwell/meta-neptune/conf/local.conf.sample
index 2b051706f..82edf0cd2 100644
--- a/meta-portwell/meta-neptune/conf/local.conf.sample
+++ b/meta-portwell/meta-neptune/conf/local.conf.sample
@@ -215,8 +215,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-supermicro/meta-x11spi/conf/local.conf.sample b/meta-supermicro/meta-x11spi/conf/local.conf.sample
index 3e69f267f..2208aeee8 100644
--- a/meta-supermicro/meta-x11spi/conf/local.conf.sample
+++ b/meta-supermicro/meta-x11spi/conf/local.conf.sample
@@ -215,8 +215,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