wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-11 17:02:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix #361: cgroup move fail if starting service as non-root

Browse Source 
Regression in v4.4

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-07-10 10:23:20 +02:00
parent 5769500afe
commit 450f498061
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+9 -7
View File
@@ -575,7 +575,6 @@ static int service_start(svc_t *svc)
int result = 0, do_progress = 1;
char cmdline[CMD_SIZE] = "";
sigset_t nmask, omask;
char grnam[80];
pid_t pid;
size_t i;
@@ -644,19 +643,22 @@ static int service_start(svc_t *svc)
goto fail;
}
if (pid > 1) {
char grnam[80];
svc->pid = pid;
svc->start_time = jiffies();
if (svc_is_tty(svc))
cgroup_user("getty", pid);
else
cgroup_service(group_name(svc, grnam, sizeof(grnam)), pid, &svc->cgroup);
} else if (pid == 0) {
char *args[MAX_NUM_SVC_ARGS + 1];
int status;
pid = getpid();
if (svc_is_tty(svc)) {
cgroup_user("getty", pid);
} else {
cgroup_service(group_name(svc, grnam, sizeof(grnam)), pid, &svc->cgroup);
if (!svc_is_tty(svc))
redirect(svc);
}
if (!svc_is_sysv(svc)) {
wordexp_t we = { 0 };