i hope this works.

1 files changed, 10 insertions, 20 deletions

diff --git a/meta-yerba/recipes-core/images/yerba-image.bb b/meta-yerba/recipes-core/images/yerba-image.bb
index 4889430..0045f2f 100644
--- a/meta-yerba/recipes-core/images/yerba-image.bb
+++ b/meta-yerba/recipes-core/images/yerba-image.bb
@@ -1,7 +1,7 @@
 SUMMARY = "Yerba Linux image"
 LICENSE = "MIT"
 
-inherit core-image
+inherit core-image extrausers
 
 IMAGE_FEATURES += "ssh-server-dropbear"
 
@@ -26,26 +26,16 @@ IMAGE_INSTALL = "\
     wireplumber \
     "
 
-PASSWD = "\$6\$ejafA1eayhrw94gC\$TkY3uLfma5N.dLf9z3axYKFw0OTCbGQivSGFT.Ja6SqYtnwmsYUNAGJ3qvvdxPSrNdmGVc1yI.kGCZ/TrsoX7."
+ROOTFS_POSTPROCESS_COMMAND += "set_yerba_password;"
 
-ROOTFS_POSTPROCESS_COMMAND += "create_yerba_user;"
+EXTRA_USERS_PARAMS = "\
+    groupadd storage; \
+    useradd -s /bin/zsh yerba; \
+    usermod -aG wheel,audio,video,storage yerba; \
+    "
 
-create_yerba_user() {
-    echo 'yerba:x:1000:1000::/home/yerba:/bin/zsh' >> ${IMAGE_ROOTFS}/etc/passwd
-    
-    echo 'yerba:x:1000:' >> ${IMAGE_ROOTFS}/etc/group
-    
-    echo 'wheel:x:10:yerba' >> ${IMAGE_ROOTFS}/etc/group
-    echo 'audio:x:29:yerba' >> ${IMAGE_ROOTFS}/etc/group
-    echo 'video:x:44:yerba' >> ${IMAGE_ROOTFS}/etc/group
-    echo 'storage:x:1000:yerba' >> ${IMAGE_ROOTFS}/etc/group
-    
-    echo 'yerba:${PASSWD}:19900:0:99999:7:::' >> ${IMAGE_ROOTFS}/etc/shadow
-    
-    mkdir -p ${IMAGE_ROOTFS}/home/yerba
-    chown 1000:1000 ${IMAGE_ROOTFS}/home/yerba
-}
+set_yerba_password() {
+    ENCRYPTED_PASS='\$6\$ejafA1eayhrw94gC\$TkY3uLfma5N.dLf9z3axYKFw0OTCbGQivSGFT.Ja6SqYtnwmsYUNAGJ3qvvdxPSrNdmGVc1yI.kGCZ/TrsoX7.'
 
-do_image_post:append() {
-    echo "Welcome to Yerba Linux" > ${IMAGE_ROOTFS}/etc/motd
+    sed -i 's%^yerba:[^:]*:%yerba:'"$ENCRYPTED_PASS"':%' ${IMAGE_ROOTFS}/etc/shadow
 }