From 58a856a433b28d2b47250ffbb4ed45a41204aa68 Mon Sep 17 00:00:00 2001
From: unitexe <unitexe70@gmail.com>
Date: Sun, 11 Jan 2026 00:40:57 -0600
Subject: Install unitexe ssh authorized keys in separate recipe

---
 .../ssh-authorized-keys/files/authorized_keys      |  1 +
 .../ssh-authorized-keys/ssh-authorized-keys.bb     | 15 ++++++++++++++
 .../recipes-users/useradd/add-user-unitexe.bb      | 24 +---------------------
 .../useradd/add-user-unitexe/authorized_keys       |  1 -
 4 files changed, 17 insertions(+), 24 deletions(-)
 create mode 100644 meta-unit-core/recipes-users/ssh-authorized-keys/files/authorized_keys
 create mode 100644 meta-unit-core/recipes-users/ssh-authorized-keys/ssh-authorized-keys.bb
 delete mode 100644 meta-unit-core/recipes-users/useradd/add-user-unitexe/authorized_keys

(limited to 'meta-unit-core')

diff --git a/meta-unit-core/recipes-users/ssh-authorized-keys/files/authorized_keys b/meta-unit-core/recipes-users/ssh-authorized-keys/files/authorized_keys
new file mode 100644
index 0000000..e567ca6
--- /dev/null
+++ b/meta-unit-core/recipes-users/ssh-authorized-keys/files/authorized_keys
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMovGBPRZAcuJiEO/3xfSqHki2b8/tZL+UfqoSoC8D27 unitexe70@gmail.com
diff --git a/meta-unit-core/recipes-users/ssh-authorized-keys/ssh-authorized-keys.bb b/meta-unit-core/recipes-users/ssh-authorized-keys/ssh-authorized-keys.bb
new file mode 100644
index 0000000..8989486
--- /dev/null
+++ b/meta-unit-core/recipes-users/ssh-authorized-keys/ssh-authorized-keys.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Add authorized SSH keys for unitexe user"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${UNIT_CORE_LAYERDIR}/LICENSE;md5=38bf13be5d6979b28bd8adddb2f2f9b3"
+
+SRC_URI = "file://authorized_keys"
+
+S = "${UNPACKDIR}"
+
+USER_NAME = "unitexe"
+
+do_install() {
+    install -D -m 0600 ${UNPACKDIR}/authorized_keys ${D}/home/${USER_NAME}/.ssh/authorized_keys
+}
+
+FILES:${PN} = "/home/${USER_NAME}/.ssh/authorized_keys"
diff --git a/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb b/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
index 4485d79..97f09f5 100644
--- a/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
+++ b/meta-unit-core/recipes-users/useradd/add-user-unitexe.bb
@@ -1,18 +1,16 @@
 SUMMARY = "Add unitexe user"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${UNIT_CORE_LAYERDIR}/LICENSE;md5=38bf13be5d6979b28bd8adddb2f2f9b3"
 
 EXCLUDE_FROM_WORLD = "1"
 
 inherit useradd
 inherit extrausers
 
-SRC_URI = "file://authorized_keys"
-
 S = "${UNPACKDIR}"
 
 RDEPENDS:${PN}:append = " sudo"
 RDEPENDS:${PN}:append = " shadow"
+RDEPENDS:${PN}:append = " ssh-authorized-keys"
 
 USERADD_PACKAGES = "${PN}"
 
@@ -22,24 +20,4 @@ USER_TO_ADD_PASSWORD_HASHED ?= "\$6\$esHchcEKubkj/1v7\$woeV0ChUqcC8J8lOEWB563mX4
 
 USERADD_PARAM:${PN} = "--uid ${USER_TO_ADD_UID} --home-dir /home/${USER_TO_ADD_NAME} --shell ${base_bindir}/sh --password '${USER_TO_ADD_PASSWORD_HASHED}' ${USER_TO_ADD_NAME}"
 
-do_install() {
-    # Give the user a home directory.
-    install -d -m 0755 ${D}/home/${USER_TO_ADD_NAME}
-
-    # Create .ssh directory.
-    install -d -m 0700 ${D}/home/${USER_TO_ADD_NAME}/.ssh
-
-    # Create authorized keys file.
-    install -m 0600 ${UNPACKDIR}/authorized_keys ${D}/home/${USER_TO_ADD_NAME}/.ssh/authorized_keys
-}
-
-pkg_postinst_ontarget:${PN}() {
-    chown -R ${USER_TO_ADD_NAME}:${USER_TO_ADD_NAME} /home/${USER_TO_ADD_NAME}
-}
-
-FILES:${PN} = "\
-    /home/${USER_TO_ADD_NAME} \
-    /home/${USER_TO_ADD_NAME}/.ssh/authorized_keys \
-"
-
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/meta-unit-core/recipes-users/useradd/add-user-unitexe/authorized_keys b/meta-unit-core/recipes-users/useradd/add-user-unitexe/authorized_keys
deleted file mode 100644
index e567ca6..0000000
--- a/meta-unit-core/recipes-users/useradd/add-user-unitexe/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMovGBPRZAcuJiEO/3xfSqHki2b8/tZL+UfqoSoC8D27 unitexe70@gmail.com
-- 
cgit v1.2.3