From 464bc831a5d896bd7f64fd4d8d600f491c74c3b5 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Thu, 4 Mar 2021 23:48:57 +0100
Subject: [PATCH] Minor refactor, create FINIT_CGPATH in finit.h to reduce
 duplicaiton

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 src/cgroup.c | 17 +++++++++--------
 src/finit.h  |  8 ++++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/cgroup.c b/src/cgroup.c
index 6c282c94..c5715a2f 100644
--- a/src/cgroup.c
+++ b/src/cgroup.c
@@ -27,6 +27,7 @@
 #include <lite/lite.h>
 #include <sys/mount.h>
 
+#include "finit.h"
 #include "log.h"
 #include "util.h"
 
@@ -70,27 +71,27 @@ void cgroup_init(void)
 	}
 
 	/* Default cgroups for process monitoring */
-	if (mkdir("/sys/fs/cgroup/finit", 0755) && EEXIST != errno)
+	if (mkdir(FINIT_CGPATH, 0755) && EEXIST != errno)
 		goto fail;
-	if (mount("none", "/sys/fs/cgroup/finit", "cgroup", opts, "none,name=finit")) {
+	if (mount("none", FINIT_CGPATH, "cgroup", opts, "none,name=finit")) {
 		_pe("Failed mounting Finit cgroup hierarchy");
 		goto fail;
 	}
 
 	/* Set up reaper and enable callbacks */
-	echo("/sys/fs/cgroup/finit/release_agent", 0, FINIT_LIBPATH_ "/cgreaper.sh");
-	echo("/sys/fs/cgroup/finit/notify_on_release", 0, "1");
+	echo(FINIT_CGPATH "/release_agent", 0, FINIT_LIBPATH_ "/cgreaper.sh");
+	echo(FINIT_CGPATH "/notify_on_release", 0, "1");
 
 	/* Default groups, PID 1, services, and user/login processes */
-	if (mkdir("/sys/fs/cgroup/finit/init", 0755) && EEXIST != errno)
+	if (mkdir(FINIT_CGPATH "/init", 0755) && EEXIST != errno)
 		goto fail;
-	if (mkdir("/sys/fs/cgroup/finit/system", 0755) && EEXIST != errno)
+	if (mkdir(FINIT_CGPATH "/system", 0755) && EEXIST != errno)
 		goto fail;
-	if (mkdir("/sys/fs/cgroup/finit/user", 0755) && EEXIST != errno)
+	if (mkdir(FINIT_CGPATH "/user", 0755) && EEXIST != errno)
 		goto fail;
 
 	/* Move ourselves to init */
-	echo("/sys/fs/cgroup/finit/init/cgroup.procs", 0, "1");
+	echo(FINIT_CGPATH "/init/cgroup.procs", 0, "1");
 
 	/* We have signal, main screen turn on! */
 	cg_init = 1;
diff --git a/src/finit.h b/src/finit.h
index 7a29eb9e..997e37cc 100644
--- a/src/finit.h
+++ b/src/finit.h
@@ -38,11 +38,15 @@
 
 /* just in case */
 #ifndef _PATH_STDPATH
-#define _PATH_STDPATH   "/usr/bin:/bin:/usr/sbin:/sbin"
+#define _PATH_STDPATH           "/usr/bin:/bin:/usr/sbin:/sbin"
 #endif
 
 #ifndef _PATH_VARRUN
-#define _PATH_VARRUN    "/var/run/"
+#define _PATH_VARRUN            "/var/run/"
+#endif
+
+#ifndef FINIT_CGPATH
+#define FINIT_CGPATH            "/sys/fs/cgroup/finit"
 #endif
 
 #define LOGIT_PATH              FINIT_LIBPATH_ "/logit"