Merge pull request #161 from thin-edge/fix-openrc-service-config

fix: openrc service ignoring config file

Author: reubenmiller

.goreleaser.yaml

@@ -166,18 +166,16 @@ nfpms:
         packager: apk
 
       # OpenRC
-      # Note: symlinks will be created linking the services during the post install script
-      # if openrc is detected
       - src: ./packaging/services/openrc/tedge-container-plugin.init
-        dst: /usr/share/tedge-container-plugin/services/openrc/init.d/tedge-container-plugin
+        dst: /etc/init.d/tedge-container-plugin
         file_info:
           mode: 0755
           owner: root
           group: root
         packager: apk
 
       - src: ./packaging/services/openrc/tedge-container-plugin.conf
-        dst: /usr/share/tedge-container-plugin/services/openrc/conf.d/tedge-container-plugin
+        dst: /etc/conf.d/tedge-container-plugin
         type: config
         file_info:
           mode: 0644

packaging/scripts/post-install

@@ -43,9 +43,6 @@ cleanInstall() {
             # OpenRC
             printf "\033[32m Installing open-rc service\033[0m\n"
 
-            ln -sf /usr/share/tedge-container-plugin/services/openrc/init.d/tedge-container-plugin /etc/init.d/tedge-container-plugin ||:
-            ln -sf /usr/share/tedge-container-plugin/services/openrc/conf.d/tedge-container-plugin /etc/conf.d/tedge-container-plugin ||:
-
             rc-update add "$SERVICE_NAME" ||:
             rc-service "$SERVICE_NAME" restart ||:
         else

packaging/services/openrc/tedge-container-plugin.init

@@ -10,7 +10,7 @@ error_log="${LOGFILE:-/var/log/${RC_SVCNAME}.log}"
 
 start_pre()
 {
-    checkpath --file --owner "root" "$error_log"
+    checkpath --file --owner "$command_user" "$error_log"
 }
 
 depend() {

pkg/container/container.go

@@ -245,7 +245,7 @@ func findContainerEngineSocket() (socketAddr string) {
 	}
 
 	currentUserID := GetUserID()
-	slog.Info("Detected user id", "id", currentUserID)
+	slog.Info("Current user", "id", currentUserID)
 
 	// docker (rootless)
 	containerSockets = append(containerSockets, fmt.Sprintf("unix:///run/user/%s/docker.sock", currentUserID))