From eca6fca7c6b90fbccbe746551a1497414be523da Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 29 Apr 2020 16:50:08 +0800 Subject: [PATCH] stx-image-aio: inherit extrausers-config in image recipe inherit extrausers-config in stx-image-aio image only instead of distro config to avoid unexpected issue for other images. Issue-ID: INF-62 Signed-off-by: Jackie Huang Change-Id: If1b67e44b39a02c960ae3b6cbfb390e647a17fea --- meta-stx/conf/distro/poky-stx.conf | 1 - meta-stx/recipes-core/images/stx-image-aio.bb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-stx/conf/distro/poky-stx.conf b/meta-stx/conf/distro/poky-stx.conf index fbd20f6..0331580 100644 --- a/meta-stx/conf/distro/poky-stx.conf +++ b/meta-stx/conf/distro/poky-stx.conf @@ -46,7 +46,6 @@ VOLATILE_LOG_DIR = "no" IMAGE_OVERHEAD_FACTOR = "1.05" # Add extra users and groups for stx -INHERIT += " extrausers-config" SYSADMIN_P = "4SuW8cnXFyxsk" EXTRA_USERS_PARAMS_CONFIG = "\ diff --git a/meta-stx/recipes-core/images/stx-image-aio.bb b/meta-stx/recipes-core/images/stx-image-aio.bb index a55adc7..b83f354 100644 --- a/meta-stx/recipes-core/images/stx-image-aio.bb +++ b/meta-stx/recipes-core/images/stx-image-aio.bb @@ -52,6 +52,7 @@ IMAGE_FEATURES += " \ " inherit stx-postrun +inherit extrausers-config inherit core-image inherit distro_features_check inherit openstack-base -- 2.16.6