X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=blobdiff_plain;f=src%2Fwgtpkg-unit.c;h=f141766af4d891b2d735fe4b0c410edf9322a104;hp=9e6a1e23ac57049b63c24a546c018f88679733f2;hb=2a8b46d16ea5d0c99831e95b47cab037f220f7af;hpb=cdd05aa3e66a876dba01f04173d817b9e5e039a0

diff --git a/src/wgtpkg-unit.c b/src/wgtpkg-unit.c
index 9e6a1e2..f141766 100644
--- a/src/wgtpkg-unit.c
+++ b/src/wgtpkg-unit.c
@@ -35,13 +35,10 @@
 #include "wgtpkg-mustach.h"
 #include "utils-json.h"
 #include "wgt-json.h"
+#include "utils-systemd.h"
 
 #include "wgtpkg-unit.h"
 
-#if !defined(SYSTEMD_UNITS_ROOT)
-# define SYSTEMD_UNITS_ROOT "/usr/local/lib/systemd"
-#endif
-
 #if 0
 #include <ctype.h>
 #else
@@ -388,54 +385,37 @@ static int check_unit_desc(const struct unitdesc *desc, int tells)
 
 static int get_unit_path(char *path, size_t pathlen, const struct unitdesc *desc)
 {
-	int rc;
+	int rc = systemd_get_unit_path(
+			path, pathlen, desc->scope == unitscope_user,
+			desc->name, desc->type == unittype_socket ? "socket" : "service");
 
-	rc = snprintf(path, pathlen, "%s/%s/%s.%s", 
-			SYSTEMD_UNITS_ROOT,
-			desc->scope == unitscope_system ? "system" : "user",
-			desc->name,
-			desc->type == unittype_socket ? "socket" : "service");
+	if (rc < 0)
+		ERROR("can't get the unit path for %s", desc->name);
 
-	if (rc >= 0 && (size_t)rc >= pathlen) {
-		ERROR("can't set the unit path");
-		errno = EINVAL;
-		rc = -1;
-	}
 	return rc;
 }
 
 static int get_wants_path(char *path, size_t pathlen, const struct unitdesc *desc)
 {
-	int rc;
+	int rc = systemd_get_wants_path(
+			path, pathlen, desc->scope == unitscope_user, desc->wanted_by,
+			desc->name, desc->type == unittype_socket ? "socket" : "service");
 
-	rc = snprintf(path, pathlen, "%s/%s/%s.wants/%s.%s", 
-			SYSTEMD_UNITS_ROOT,
-			desc->scope == unitscope_system ? "system" : "user",
-			desc->wanted_by,
-			desc->name,
-			desc->type == unittype_socket ? "socket" : "service");
+	if (rc < 0)
+		ERROR("can't get the wants path for %s and %s", desc->name, desc->wanted_by);
 
-	if (rc >= 0 && (size_t)rc >= pathlen) {
-		ERROR("can't set the wants path");
-		errno = EINVAL;
-		rc = -1;
-	}
 	return rc;
 }
 
 static int get_wants_target(char *path, size_t pathlen, const struct unitdesc *desc)
 {
-	int rc;
+	int rc = systemd_get_wants_target(
+			path, pathlen,
+			desc->name, desc->type == unittype_socket ? "socket" : "service");
 
-	rc = snprintf(path, pathlen, "../%s.%s", 
-			desc->name,
-			desc->type == unittype_socket ? "socket" : "service");
+	if (rc < 0)
+		ERROR("can't get the wants target for %s", desc->name);
 
-	if (rc >= 0 && (size_t)rc >= pathlen) {
-		ERROR("can't set the wants target");
-		errno = EINVAL;
-		rc = -1;
-	}
 	return rc;
 }