aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArslaan Pathan <[email protected]>2026-06-20 09:49:35 +1200
committerArslaan Pathan <[email protected]>2026-06-20 09:49:35 +1200
commita9dfd56c0737d290257cdd730b510541411b38a4 (patch)
treefdedced508a42cbc6e17de64647e34c94c22bbfc
parentac992d8111dc113d27a7cdee6d621bcd6722df26 (diff)
downloadyerbalinux-a9dfd56c0737d290257cdd730b510541411b38a4.tar.xz
yerbalinux-a9dfd56c0737d290257cdd730b510541411b38a4.zip
Use a separate bitbake recipe for this?
-rw-r--r--meta-yerba/recipes-core/images/yerba-image.bb18
-rw-r--r--meta-yerba/recipes-core/yerba-user/yerba-user.bb9
2 files changed, 11 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
-}
diff --git a/meta-yerba/recipes-core/yerba-user/yerba-user.bb b/meta-yerba/recipes-core/yerba-user/yerba-user.bb
new file mode 100644
index 0000000..be83674
--- /dev/null
+++ b/meta-yerba/recipes-core/yerba-user/yerba-user.bb
@@ -0,0 +1,9 @@
+SUMMARY = "Add a non-root user with doas permissions"
+LICENSE = "MIT"
+
+inherit useradd
+
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM:${PN} = "-p '$6$ejafA1eayhrw94gC$TkY3uLfma5N.dLf9z3axYKFw0OTCbGQivSGFT.Ja6SqYtnwmsYUNAGJ3qvvdxPSrNdmGVc1yI.kGCZ/TrsoX7.' -s /bin/zsh -G wheel,audio,video,storage -m exampleuser"
+
+BB_DONT_CACHE = "1"