1 files changed, 12 insertions, 15 deletions
diff --git a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-core/systemd/systemd-regkeygen.bb b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-core/systemd/systemd-regkeygen.bb
index 7272206..dc925d7 100644
--- a/meta-unit-core/dynamic-layers/virtualization-layer/recipes-core/systemd/systemd-regkeygen.bb
+++ b/meta-unit-core/dynamic-layers/virtualization-layer/recipes-core/systemd/systemd-regkeygen.bb
@@ -2,7 +2,7 @@ SUMMARY = "Systemd service for generating TLS key and cert for distribution"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${UNIT_CORE_LAYERDIR}/LICENSE;md5=38bf13be5d6979b28bd8adddb2f2f9b3"
 
-inherit systemd
+SYSTEMD_SERVICE:${PN} = "regkeygen.service"
 
 SRC_URI = "\
     file://regkeygen.service \
@@ -10,25 +10,22 @@ SRC_URI = "\
 "
 
 RDEPENDS:${PN}:append = " add-user-svc"
-RDEPENDS:${PN}:append = " openssl"
 
 S = "${UNPACKDIR}"
 
-SYSTEMD_USER = "svc"
-SYSTEMD_USER_UNITDIR = "/home/${SYSTEMD_USER}/.config/systemd/user"
-USER_BINDIR = "/home/${SYSTEMD_USER}/bin"
-
 do_install() {
-    install -D -p -m0644 ${UNPACKDIR}/regkeygen.service ${D}${SYSTEMD_USER_UNITDIR}/regkeygen.service
-    install -D -p -m0755 ${UNPACKDIR}/regkeygen.sh ${D}${USER_BINDIR}/regkeygen.sh
-    
-    # Auto-enable systemd unit by creating the appropriate symlink
-    install -d ${D}${SYSTEMD_USER_UNITDIR}/default.target.wants
-    ln -sf ${SYSTEMD_USER_UNITDIR}/regkeygen.service ${D}${SYSTEMD_USER_UNITDIR}/default.target.wants/regkeygen.service
+    install -D -p -m0644 ${UNPACKDIR}/regkeygen.service ${D}${systemd_system_unitdir}/regkeygen.service
+    install -D -p -m0755 ${UNPACKDIR}/regkeygen.sh ${D}${bindir}/regkeygen.sh
 }
 
+inherit systemd
+
 FILES:${PN} = "\
-    ${SYSTEMD_USER_UNITDIR}/regkeygen.service \
-    ${SYSTEMD_USER_UNITDIR}/default.target.wants/regkeygen.service \
-    ${USER_BINDIR}/regkeygen.sh \
+    ${systemd_system_unitdir} \
+    ${bindir} \
+"
+
+RDEPENDS:${PN} = "\
+    openssl \
+    ca-certificates \
 "