diff options
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 e65be03f9c..e1de4843c3 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 b73edee35a..a33ae30cf1 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 aeb3ae0b8c..95c55352bd 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 c7b9c3c642..5b8c9cd833 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 c9dffc2e4c..069682d630 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 a111ba715e..586cbd78e0 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 57260f06b1..45061f7678 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 56a7e9621a..5defaa1d7c 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 ef46e0c03a..dc18dce8bc 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 7aed7cbd48..e3eb454ae6 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 2b051706f9..82edf0cd29 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 3e69f267fd..2208aeee86 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 |