From 80d231165357cf0d57b23dfe3b0aa16c7cb79545 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 31 Jan 2023 12:06:01 +0000 Subject: Prepare for 2.11.2.1, move template location, change file list Signed-off-by: Laurent Bercot --- src/instance/s6-instance-maker.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/instance/s6-instance-maker.c') diff --git a/src/instance/s6-instance-maker.c b/src/instance/s6-instance-maker.c index 8a82157..fcb67ac 100644 --- a/src/instance/s6-instance-maker.c +++ b/src/instance/s6-instance-maker.c @@ -62,7 +62,7 @@ static void write_service (char const *dir, char const *template, char const *us svinfo data = { .user = user, .maxinstances = maxinstances } ; size_t dirlen = strlen(dir) ; mode_t m ; - char fn[dirlen + 21] ; + char fn[dirlen + 11] ; s6_auto_write_service(dir, 3, &write_run, &data, logger) ; memcpy(fn, dir, dirlen) ; memcpy(fn + dirlen, "/instance", 10) ; @@ -71,7 +71,7 @@ static void write_service (char const *dir, char const *template, char const *us memcpy(fn + dirlen + 9, "s", 2) ; if (mkdir(fn, 0755) == -1) strerr_diefu2sys(111, "mkdir ", fn) ; umask(m) ; - memcpy(fn + dirlen + 10, "/.template", 11) ; + memcpy(fn + dirlen, "/template", 10) ; if (!hiercopy_tmp(template, fn, &sa)) strerr_diefu4sys(111, "copy file hierarchy from ", template, " to ", fn) ; } -- cgit v1.3.1