1 files changed, 2 insertions, 16 deletions
diff --git a/meta-yerba/recipes-core/images/yerba-image.bb b/meta-yerba/recipes-core/images/yerba-image.bb
index d71e23e..7b70c8b 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 extrausers
+inherit core-image
 
 IMAGE_FEATURES += "ssh-server-dropbear"
 
@@ -9,6 +9,7 @@ IMAGE_INSTALL = "\
     packagegroup-core-boot \
     packagegroup-core-base-utils \
     ${CORE_IMAGE_EXTRA_INSTALL} \
+    yerba-user \
     runit \
     runit-serialgetty \
     runit-dhcpcd \
@@ -25,18 +26,3 @@ IMAGE_INSTALL = "\
     pipewire \
     wireplumber \
     "
-
-ROOTFS_POSTPROCESS_COMMAND += "set_yerba_password;"
-
-EXTRA_USERS_PARAMS = "\
-    groupadd storage; \
-    useradd -s /bin/zsh yerba; \
-    usermod -aG wheel,audio,video,storage yerba; \
-    "
-
-set_yerba_password() {
-    ENCRYPTED_PASS='\$6\$ejafA1eayhrw94gC\$TkY3uLfma5N.dLf9z3axYKFw0OTCbGQivSGFT.Ja6SqYtnwmsYUNAGJ3qvvdxPSrNdmGVc1yI.kGCZ/TrsoX7.'
-    
-    sed -i '/^yerba:/d' ${IMAGE_ROOTFS}/etc/shadow
-    echo "yerba:${ENCRYPTED_PASS}:19900:0:99999:7:::" >> ${IMAGE_ROOTFS}/etc/shadow
-}