From 5c877db47d7cba9f72cd93eb54290941a99b9a3c Mon Sep 17 00:00:00 2001
From: Ghassane Ben El Aattar <ghassaneb.aattar@huawei.com>
Date: Tue, 9 Aug 2022 08:09:12 +0000
Subject: [PATCH] oniro-user: Made the username a variable. This should make it
possible to edit credentials anytime through a script.
Signed-off-by: Ghassane Ben El Aattar <ghassaneb.aattar@huawei.com>
---
meta-oniro-core/classes/oniro-user.bbclass | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/meta-oniro-core/classes/oniro-user.bbclass b/meta-oniro-core/classes/oniro-user.bbclass
index be503026..032e5cb2 100644
--- a/meta-oniro-core/classes/oniro-user.bbclass
+++ b/meta-oniro-core/classes/oniro-user.bbclass
@@ -5,16 +5,17 @@
# Add a new user named oniro with default password oniro
inherit extrausers
-# This is a sha512 hash of the word "oniro"
+# This is a sha512 hash of the chosen password, by default it's the word "oniro"
# To generate a new password run the following command:
# $ mkpasswd -m sha512crypt
-# WARNING: this is a temporary solution until we have a provisioning solution to set up the initial password
-ONIRO_USER_PASSWORD ?= "\$6\$cI/pmFRW1S8seZ24\$e/7XAuVsOBgoAEmlKQnk54.jQEpRuQmmzik6.1Osaji7ca.04N70Ji.PN86sFXBvqwDGhhSr.jqZsDDA8OVuy."
+DEFAULT_USER_PASSWORD ?= "\$6\$OQzoC.wu9LDCEs/.\$IPXgswE3EXBYkkMUotolWlUGGJ.zcQjAOlN5C5xEH7dwS/qRKDaL9BSKdsZ/wK5v8TrL2cGQipm4bBUByBVm40"
-EXTRA_USERS_PARAMS = "\
- useradd -p '${ONIRO_USER_PASSWORD}' oniro; \
-"
+DEFAULT_USER_USERNAME ?= "oniro"
+EXTRA_USERS_PARAMS = "\
+ useradd -p '${DEFAULT_USER_PASSWORD}' ${DEFAULT_USER_USERNAME}; \
+"
+
IMAGE_INSTALL:append = " sudo"
# Add to secure_path:
@@ -26,8 +27,8 @@ IMAGE_INSTALL:append = " sudo"
# - /usr/local/sbin
# Add oniro to the sudo users
init_user_oniro () {
- echo "oniro ALL=(ALL:ALL) ALL" > ${IMAGE_ROOTFS}/etc/sudoers.d/oniro
- echo "Defaults secure_path=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" >> ${IMAGE_ROOTFS}/etc/sudoers.d/oniro
+ echo "${DEFAULT_USER_USERNAME} ALL=(ALL:ALL) ALL" > ${IMAGE_ROOTFS}/etc/sudoers.d/${DEFAULT_USER_USERNAME}
+ echo "Defaults secure_path=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin" >> ${IMAGE_ROOTFS}/etc/sudoers.d/${DEFAULT_USER_USERNAME}
}
ROOTFS_POSTPROCESS_COMMAND:append = " init_user_oniro;"
--
GitLab