diff options
| author | Alexander Filippov <a.filippov@yadro.com> | 2021-10-27 16:18:26 +0300 |
|---|---|---|
| committer | Alexander Amelkin <a.amelkin@yadro.com> | 2021-11-01 14:02:45 +0300 |
| commit | f6066ff61e9b04142792a0bc8983ce62019e16ca (patch) | |
| tree | c8109245e016b76a953c24898f3829f4e35926d2 /meta-yadro | |
| parent | b2afe3b9caeb2be3aac9f81022bb8fc656ab5a4e (diff) | |
| download | openbmc-f6066ff61e9b04142792a0bc8983ce62019e16ca.tar.xz | |
meta-nicole: admin-account: Move to local.conf
This refixes of 905072f5c1d2f1e2bd99fb3346ee2978428b992b commit as pure
build without sstate-cache is still broken.
This commit moves the admin account creation from the standalone package
to the bitbake config file.
Change-Id: I6d4cfe41b1e6e2f5e707f4e942a8e4df93277e93
Signed-off-by: Alexander Filippov <a.filippov@yadro.com>
Diffstat (limited to 'meta-yadro')
3 files changed, 6 insertions, 39 deletions
diff --git a/meta-yadro/meta-nicole/conf/local.conf.sample b/meta-yadro/meta-nicole/conf/local.conf.sample index 8e426c7ae..4a91b28ff 100644 --- a/meta-yadro/meta-nicole/conf/local.conf.sample +++ b/meta-yadro/meta-nicole/conf/local.conf.sample @@ -256,3 +256,9 @@ CONF_VERSION = "2" # Set the root password to '0penBmc' # Defaults from meta-phosphor/conf/distro/include/phosphor-defaults.inc + +# Add default administrative account (login: admin, password: admin) +DEFAULT_ADMIN_PASSWORD = "'\$6\$Fze0kFe8\$YjEc0mvYcwZvjBtnVWQ4Os4gFMDj.ogBkg2jTSjpOgFQpT33hDitAUheGGJcSZ0PkzRuzOq/xhpJ5bmrFg46R.'" +EXTRA_USERS_PARAMS:append:pn-obmc-phosphor-image = "\ + useradd -p ${DEFAULT_ADMIN_PASSWORD} -g users -G priv-admin,ipmi -N admin; \ +" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend index a18048d7f..2055e9992 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,5 +1,4 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ - admin-account \ first-boot-set-hostname \ mboxd \ obmc-yadro-cli \ diff --git a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb b/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb deleted file mode 100644 index 1bb0ae1a6..000000000 --- a/meta-yadro/meta-nicole/recipes-phosphor/users/admin-account.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Default administrative account" -DESCRIPTION = "Creating default account for system administrator" -PR = "r1" - -inherit useradd - -# License info -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -# Dependencies -RDEPENDS:${PN} = "\ - sudo \ - phosphor-ipmi-host \ - phosphor-user-manager \ -" - -# Groups -GROUP_ADMIN = "priv-admin" -GROUP_OPERATOR = "priv-operator" -GROUP_USER = "priv-user" -GROUP_IPMI = "ipmi" - -# Default administrative account (login: admin, password: admin) -ADMIN_LOGIN = "admin" -ADMIN_PASSW = "\$1\$Fze0kFe8\$sylEANC01t.osF8OewyB/1" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--groups ${GROUP_ADMIN},${GROUP_IPMI} \ - --password '${ADMIN_PASSW}' \ - ${ADMIN_LOGIN}" - -# We don't have package body -ALLOW_EMPTY:${PN} = "1" - -# Workaround for meta-phosphor/classes/phosphor-rootfs-postcommands.bbclass. -# The bb-script cannot add root to non-empty groups (invalid sed command). -GROUPMEMS_PARAM:${PN} = "-a root -g ${GROUP_ADMIN}; \ - -a root -g ${GROUP_IPMI}" |