treewide: Don't duplicate default extrausers config
phosphor-defaults.inc now automatically inherits extrausers and
configures the default root/0penBmc account, so individual platforms no
longer need to specify either explicitly.
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Change-Id: Ic2b725f0eaadfafef67069449497e57438fa0fba
diff --git a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
index 3d40532..a8066b3 100644
--- a/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
+++ b/meta-asrock/meta-e3c246d4i/conf/local.conf.sample
@@ -15,7 +15,3 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
index bef2b45..351a272 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2500/conf/local.conf.sample
@@ -15,9 +15,5 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample
index 21cb261..7da9adf 100644
--- a/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample
+++ b/meta-evb/meta-evb-aspeed/meta-evb-ast2600/conf/local.conf.sample
@@ -15,9 +15,5 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
require conf/machine/include/obmc-bsp-common.inc
diff --git a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample
index c838d27..1c35170 100644
--- a/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample
+++ b/meta-evb/meta-evb-nuvoton/meta-evb-npcm750/conf/local.conf.sample
@@ -15,7 +15,3 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
diff --git a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
index cf4093f..9348b73 100644
--- a/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -39,7 +39,6 @@
# set to / (the root directory) to allow dropbear ssh connections.
# Override defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc
-inherit extrausers
#IBM_EXTRA_USERS_PARAMS += " \
# usermod -p ${DEFAULT_OPENBMC_PASSWORD} root; \
diff --git a/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend b/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend
index 9d07944..6355ccd 100644
--- a/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend
+++ b/meta-inventec/meta-transformers/recipes-phosphor/image/obmc-phosphor-image.bbappend
@@ -1,5 +1,3 @@
-inherit extrausers
-
EXTRA_USERS_PARAMS:append = " \
useradd -e '' -ou 0 -d /home/root -G priv-admin,root,sudo,ipmi,web,redfish -p 'gzW59equAcJAg' sysadmin; \
useradd -e '' -ou 0 -d /home/root -G priv-admin,root,sudo,ipmi,web,redfish -p 'kFdHdjRkot8KQ' admin; \
diff --git a/meta-quanta/meta-f0b/conf/local.conf.sample b/meta-quanta/meta-f0b/conf/local.conf.sample
index e6e074d..69c7711 100644
--- a/meta-quanta/meta-f0b/conf/local.conf.sample
+++ b/meta-quanta/meta-f0b/conf/local.conf.sample
@@ -15,4 +15,3 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
diff --git a/meta-quanta/meta-q71l/conf/local.conf.sample b/meta-quanta/meta-q71l/conf/local.conf.sample
index 278fc4d..5febc77 100644
--- a/meta-quanta/meta-q71l/conf/local.conf.sample
+++ b/meta-quanta/meta-q71l/conf/local.conf.sample
@@ -15,7 +15,3 @@
HALT,${SSTATE_DIR},100M,1K \
HALT,/tmp,10M,1K"
CONF_VERSION = "2"
-INHERIT += "extrausers"
-EXTRA_USERS_PARAMS = " \
- usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
- "
diff --git a/meta-yadro/meta-vegman/conf/local.conf.sample b/meta-yadro/meta-vegman/conf/local.conf.sample
index 3f0f050..0dae65bb 100644
--- a/meta-yadro/meta-vegman/conf/local.conf.sample
+++ b/meta-yadro/meta-vegman/conf/local.conf.sample
@@ -254,8 +254,6 @@
# this doesn't mean anything to you.
CONF_VERSION = "2"
-INHERIT += "extrausers"
-
EXTRA_USERS_PARAMS:append:pn-obmc-phosphor-image = " \
useradd -g users -G priv-admin,web,redfish,ipmi -N admin; \
"