openharmony-standard: Run samgr as systemd service

Signed-off-by: Esben Haabendal <esben@geanix.com>

recipes-openharmony/openharmony/files/openharmony-preinit

@@ -104,12 +104,6 @@ setparam persist.ace.trace.enabled 0
 # - pre-init stage
 # - init stage
 
-if systemctl -q is-enabled samgr.service; then
-	echo >/dev/console "Starting OpenHarmony samgr service"
-	/system/bin/samgr &
-	sleep "$STARTUP_CMD_SLEEP"
-fi
-
 # - post-init stage
 #   - "trigger early-fs",
 #   - "trigger fs",

recipes-openharmony/openharmony/files/openharmony-preinit.service

@@ -2,6 +2,8 @@
 Description=OpenHarmony pre-init setup
 After=param.service
 Requires=param.service
+After=samgr.service
+Requires=samgr.service
 
 [Service]
 Type=oneshot

recipes-openharmony/openharmony/files/samgr.service

 [Unit]
 Description=OpenHarmony SystemAbilityFramework service
+# Logging to hilogd, but seems to work without it
+Wants=hilogd.service
+After=hilogd.service
 
 [Service]
-Type=oneshot
-ExecStart=/bin/echo "OpenHarmony SystemAbilityFramework Service"
-RemainAfterExit=yes
+Type=notify
+ExecStartPre=!install -m 755 -o system -g system -d /data/sadata_de /data/sadata_de/samgr
+User=system
+Group=system
+ExecStart=/usr/bin/samgr
 
 [Install]
 WantedBy=multi-user.target

recipes-openharmony/openharmony/openharmony-standard-3.0/samgr-sd-notify.patch

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+Patch for //foundation/distributedschedule/samgr of OpenHarmony 3.0 codebase
+
+This adds sd_notify(3) ready notification to samgr service for better
+integration with systemd.
+
+Signed-off-by: Esben Haabendal <esben@geanix.com>
+Upstream-Status: Pending
+
 diff --git a/services/samgr/native/BUILD.gn b/services/samgr/native/BUILD.gn
 index 9b7e4a4e6301..48c512f430e6 100755
 --- a/services/samgr/native/BUILD.gn

recipes-openharmony/openharmony/openharmony-standard_3.0.bb

@@ -771,7 +771,6 @@ FILES:${PN}-samgr = " \
     ${bindir}/samgr \
     ${libdir}/libsamgr*${SOLIBS} \
     ${libdir}/liblsamgr*${SOLIBS} \
-    ${systemd_unitdir}/samgr.service \
 "
 SYSTEMD_PACKAGES += "${PN}-samgr"
 SYSTEMD_SERVICE:${PN}-samgr = "samgr.service"