summaryrefslogtreecommitdiff
path: root/meta-portwell/meta-neptune/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-portwell/meta-neptune/conf')
-rw-r--r--meta-portwell/meta-neptune/conf/layer.conf2
-rw-r--r--meta-portwell/meta-neptune/conf/local.conf.sample6
2 files changed, 2 insertions, 6 deletions
diff --git a/meta-portwell/meta-neptune/conf/layer.conf b/meta-portwell/meta-neptune/conf/layer.conf
index 3ca3cac68..652c8a85d 100644
--- a/meta-portwell/meta-neptune/conf/layer.conf
+++ b/meta-portwell/meta-neptune/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "neptune"
BBFILE_PATTERN_neptune = ""
-LAYERSERIES_COMPAT_neptune = "gatesgarth hardknott"
+LAYERSERIES_COMPAT_neptune = "hardknott"
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